patches/openpdroid/4.1/cm/20121018/services.patch

   1 diff -Npru stock-services/smali/com/android/server/am/BroadcastQueue.smali opd-services/smali/com/android/server/am/BroadcastQueue.smali
   2 --- stock-services/smali/com/android/server/am/BroadcastQueue.smali     2013-01-09 03:22:09.916293904 -0600
   3 +++ opd-services/smali/com/android/server/am/BroadcastQueue.smali       2013-01-09 03:21:57.360231646 -0600
   4 @@ -559,6 +559,118 @@
   5      goto :goto_153
   6  .end method
   7
   8 +.method private enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
   9 +    .registers 10
  10 +
  11 +    if-eqz p2, :cond_3b
  12 +
  13 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
  14 +
  15 +    if-eqz v4, :cond_3b
  16 +
  17 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
  18 +
  19 +    invoke-virtual {v4}, Landroid/content/Intent;->getAction()Ljava/lang/String;
  20 +
  21 +    move-result-object v4
  22 +
  23 +    if-eqz v4, :cond_3b
  24 +
  25 +    const/4 v2, 0x0
  26 +
  27 +    const/4 v3, -0x1
  28 +
  29 +    :try_start_10
  30 +    instance-of v4, p1, Lcom/android/server/am/BroadcastFilter;
  31 +
  32 +    if-eqz v4, :cond_3c
  33 +
  34 +    move-object v0, p1
  35 +
  36 +    check-cast v0, Lcom/android/server/am/BroadcastFilter;
  37 +
  38 +    move-object v4, v0
  39 +
  40 +    iget-object v4, v4, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
  41 +
  42 +    iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
  43 +
  44 +    iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
  45 +
  46 +    iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
  47 +
  48 +    check-cast p1, Lcom/android/server/am/BroadcastFilter;
  49 +
  50 +    iget-object v4, p1, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
  51 +
  52 +    iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
  53 +
  54 +    iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
  55 +
  56 +    iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
  57 +    :try_end_2a
  58 +    .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_2a} :catch_53
  59 +
  60 +    :cond_2a
  61 +    :goto_2a
  62 +    if-eqz v2, :cond_3b
  63 +
  64 +    const/4 v4, -0x1
  65 +
  66 +    if-eq v3, v4, :cond_3b
  67 +
  68 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
  69 +
  70 +    const/4 v5, 0x0
  71 +
  72 +    iget-object v6, p2, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
  73 +
  74 +    invoke-interface {v6}, Ljava/util/List;->size()I
  75 +
  76 +    move-result v6
  77 +
  78 +    invoke-static {v2, v3, v4, v5, v6}, Landroid/privacy/surrogate/PrivacyActivityManagerService;->enforcePrivacyPermission(Ljava/lang/String;ILandroid/content/Intent;Landroid/content/Context;I)V
  79 +
  80 +    :cond_3b
  81 +    :goto_3b
  82 +    return-void
  83 +
  84 +    :cond_3c
  85 +    :try_start_3c
  86 +    instance-of v4, p1, Landroid/content/pm/ResolveInfo;
  87 +
  88 +    if-eqz v4, :cond_2a
  89 +
  90 +    move-object v0, p1
  91 +
  92 +    check-cast v0, Landroid/content/pm/ResolveInfo;
  93 +
  94 +    move-object v4, v0
  95 +
  96 +    iget-object v4, v4, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
  97 +
  98 +    iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
  99 +
 100 +    iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 101 +
 102 +    check-cast p1, Landroid/content/pm/ResolveInfo;
 103 +
 104 +    iget-object v4, p1, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 105 +
 106 +    iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
 107 +
 108 +    iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
 109 +    :try_end_52
 110 +    .catch Ljava/lang/Exception; {:try_start_3c .. :try_end_52} :catch_53
 111 +
 112 +    goto :goto_2a
 113 +
 114 +    :catch_53
 115 +    move-exception v1
 116 +
 117 +    goto :goto_3b
 118 +.end method
 119 +
 120  .method private static performReceiveLocked(Lcom/android/server/am/ProcessRecord;Landroid/content/IIntentReceiver;Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZ)V
 121      .registers 16
 122      .annotation system Ldalvik/annotation/Throws;
 123 @@ -1931,15 +2043,15 @@
 124  .end method
 125
 126  .method final processNextBroadcast(Z)V
 127 -    .registers 37
 128 +    .registers 38
 129
 130      move-object/from16 v0, p0
 131
 132      iget-object v0, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 133
 134 -    move-object/from16 v34, v0
 135 +    move-object/from16 v35, v0
 136
 137 -    monitor-enter v34
 138 +    monitor-enter v35
 139
 140      :try_start_7
 141      move-object/from16 v0, p0
 142 @@ -1976,15 +2088,15 @@
 143
 144      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 145
 146 -    move-result-object v27
 147 +    move-result-object v28
 148
 149 -    check-cast v27, Lcom/android/server/am/BroadcastRecord;
 150 +    check-cast v28, Lcom/android/server/am/BroadcastRecord;
 151
 152      invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 153
 154      move-result-wide v5
 155
 156 -    move-object/from16 v0, v27
 157 +    move-object/from16 v0, v28
 158
 159      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 160
 161 @@ -1992,11 +2104,11 @@
 162
 163      move-result-wide v5
 164
 165 -    move-object/from16 v0, v27
 166 +    move-object/from16 v0, v28
 167
 168      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
 169
 170 -    move-object/from16 v0, v27
 171 +    move-object/from16 v0, v28
 172
 173      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 174
 175 @@ -2004,43 +2116,43 @@
 176
 177      move-result v12
 178
 179 -    const/16 v17, 0x0
 180 +    const/16 v18, 0x0
 181
 182      :goto_44
 183 -    move/from16 v0, v17
 184 +    move/from16 v0, v18
 185
 186      if-ge v0, v12, :cond_61
 187
 188 -    move-object/from16 v0, v27
 189 +    move-object/from16 v0, v28
 190
 191      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 192
 193 -    move/from16 v0, v17
 194 +    move/from16 v0, v18
 195
 196      invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 197
 198 -    move-result-object v30
 199 +    move-result-object v31
 200
 201 -    check-cast v30, Lcom/android/server/am/BroadcastFilter;
 202 +    check-cast v31, Lcom/android/server/am/BroadcastFilter;
 203
 204      const/4 v3, 0x0
 205
 206      move-object/from16 v0, p0
 207
 208 -    move-object/from16 v1, v27
 209 +    move-object/from16 v1, v28
 210
 211 -    move-object/from16 v2, v30
 212 +    move-object/from16 v2, v31
 213
 214      invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 215
 216 -    add-int/lit8 v17, v17, 0x1
 217 +    add-int/lit8 v18, v18, 0x1
 218
 219      goto :goto_44
 220
 221      :cond_61
 222      move-object/from16 v0, p0
 223
 224 -    move-object/from16 v1, v27
 225 +    move-object/from16 v1, v28
 226
 227      invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
 228
 229 @@ -2049,7 +2161,7 @@
 230      :catchall_69
 231      move-exception v3
 232
 233 -    monitor-exit v34
 234 +    monitor-exit v35
 235      :try_end_6b
 236      .catchall {:try_start_7 .. :try_end_6b} :catchall_69
 237
 238 @@ -2094,17 +2206,17 @@
 239
 240      if-nez v3, :cond_94
 241
 242 -    const/16 v19, 0x1
 243 +    const/16 v20, 0x1
 244
 245      :goto_8f
 246      monitor-exit v5
 247      :try_end_90
 248      .catchall {:try_start_79 .. :try_end_90} :catchall_97
 249
 250 -    if-nez v19, :cond_9a
 251 +    if-nez v20, :cond_9a
 252
 253      :try_start_92
 254 -    monitor-exit v34
 255 +    monitor-exit v35
 256      :try_end_93
 257      .catchall {:try_start_92 .. :try_end_93} :catchall_69
 258
 259 @@ -2112,7 +2224,7 @@
 260      return-void
 261
 262      :cond_94
 263 -    const/16 v19, 0x0
 264 +    const/16 v20, 0x0
 265
 266      goto :goto_8f
 267
 268 @@ -2201,7 +2313,7 @@
 269      iput-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
 270
 271      :cond_e2
 272 -    const/16 v21, 0x0
 273 +    const/16 v22, 0x0
 274
 275      :cond_e4
 276      move-object/from16 v0, p0
 277 @@ -2220,7 +2332,7 @@
 278
 279      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->scheduleAppGcsLocked()V
 280
 281 -    if-eqz v21, :cond_fe
 282 +    if-eqz v22, :cond_fe
 283
 284      move-object/from16 v0, p0
 285
 286 @@ -2229,7 +2341,7 @@
 287      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->updateOomAdjLocked()V
 288
 289      :cond_fe
 290 -    monitor-exit v34
 291 +    monitor-exit v35
 292
 293      goto :goto_93
 294
 295 @@ -2242,25 +2354,25 @@
 296
 297      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 298
 299 -    move-result-object v27
 300 +    move-result-object v28
 301
 302 -    check-cast v27, Lcom/android/server/am/BroadcastRecord;
 303 +    check-cast v28, Lcom/android/server/am/BroadcastRecord;
 304
 305 -    const/16 v16, 0x0
 306 +    const/16 v17, 0x0
 307
 308 -    move-object/from16 v0, v27
 309 +    move-object/from16 v0, v28
 310
 311      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 312
 313      if-eqz v3, :cond_1dd
 314
 315 -    move-object/from16 v0, v27
 316 +    move-object/from16 v0, v28
 317
 318      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 319
 320      invoke-interface {v3}, Ljava/util/List;->size()I
 321
 322 -    move-result v25
 323 +    move-result v26
 324
 325      :goto_11b
 326      move-object/from16 v0, p0
 327 @@ -2271,7 +2383,7 @@
 328
 329      if-eqz v3, :cond_1d4
 330
 331 -    move-object/from16 v0, v27
 332 +    move-object/from16 v0, v28
 333
 334      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 335
 336 @@ -2283,11 +2395,11 @@
 337
 338      invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 339
 340 -    move-result-wide v23
 341 +    move-result-wide v24
 342
 343 -    if-lez v25, :cond_1d4
 344 +    if-lez v26, :cond_1d4
 345
 346 -    move-object/from16 v0, v27
 347 +    move-object/from16 v0, v28
 348
 349      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 350
 351 @@ -2299,7 +2411,7 @@
 352
 353      mul-long/2addr v7, v9
 354
 355 -    move/from16 v0, v25
 356 +    move/from16 v0, v26
 357
 358      int-to-long v9, v0
 359
 360 @@ -2307,7 +2419,7 @@
 361
 362      add-long/2addr v5, v7
 363
 364 -    cmp-long v3, v23, v5
 365 +    cmp-long v3, v24, v5
 366
 367      if-lez v3, :cond_1d4
 368
 369 @@ -2343,7 +2455,7 @@
 370
 371      move-result-object v5
 372
 373 -    move-wide/from16 v0, v23
 374 +    move-wide/from16 v0, v24
 375
 376      invoke-virtual {v5, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 377
 378 @@ -2355,7 +2467,7 @@
 379
 380      move-result-object v5
 381
 382 -    move-object/from16 v0, v27
 383 +    move-object/from16 v0, v28
 384
 385      iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 386
 387 @@ -2369,7 +2481,7 @@
 388
 389      move-result-object v5
 390
 391 -    move-object/from16 v0, v27
 392 +    move-object/from16 v0, v28
 393
 394      iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 395
 396 @@ -2383,7 +2495,7 @@
 397
 398      move-result-object v5
 399
 400 -    move-object/from16 v0, v27
 401 +    move-object/from16 v0, v28
 402
 403      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 404
 405 @@ -2397,7 +2509,7 @@
 406
 407      move-result-object v5
 408
 409 -    move/from16 v0, v25
 410 +    move/from16 v0, v26
 411
 412      invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 413
 414 @@ -2409,7 +2521,7 @@
 415
 416      move-result-object v5
 417
 418 -    move-object/from16 v0, v27
 419 +    move-object/from16 v0, v28
 420
 421      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 422
 423 @@ -2423,7 +2535,7 @@
 424
 425      move-result-object v5
 426
 427 -    move-object/from16 v0, v27
 428 +    move-object/from16 v0, v28
 429
 430      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 431
 432 @@ -2443,55 +2555,55 @@
 433
 434      invoke-virtual {v0, v3}, Lcom/android/server/am/BroadcastQueue;->broadcastTimeoutLocked(Z)V
 435
 436 -    const/16 v16, 0x1
 437 +    const/16 v17, 0x1
 438
 439      const/4 v3, 0x0
 440
 441 -    move-object/from16 v0, v27
 442 +    move-object/from16 v0, v28
 443
 444      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 445
 446      :cond_1d4
 447 -    move-object/from16 v0, v27
 448 +    move-object/from16 v0, v28
 449
 450      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 451
 452      if-eqz v3, :cond_1e1
 453
 454 -    monitor-exit v34
 455 +    monitor-exit v35
 456
 457      goto/16 :goto_93
 458
 459      :cond_1dd
 460 -    const/16 v25, 0x0
 461 +    const/16 v26, 0x0
 462
 463      goto/16 :goto_11b
 464
 465      :cond_1e1
 466 -    move-object/from16 v0, v27
 467 +    move-object/from16 v0, v28
 468
 469      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 470
 471      if-eqz v3, :cond_1f7
 472
 473 -    move-object/from16 v0, v27
 474 +    move-object/from16 v0, v28
 475
 476      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 477
 478 -    move/from16 v0, v25
 479 +    move/from16 v0, v26
 480
 481      if-ge v3, v0, :cond_1f7
 482
 483 -    move-object/from16 v0, v27
 484 +    move-object/from16 v0, v28
 485
 486      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
 487
 488      if-nez v3, :cond_1f7
 489
 490 -    if-eqz v16, :cond_23a
 491 +    if-eqz v17, :cond_23a
 492
 493      :cond_1f7
 494 -    move-object/from16 v0, v27
 495 +    move-object/from16 v0, v28
 496
 497      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 498      :try_end_1fb
 499 @@ -2500,31 +2612,31 @@
 500      if-eqz v3, :cond_224
 501
 502      :try_start_1fd
 503 -    move-object/from16 v0, v27
 504 +    move-object/from16 v0, v28
 505
 506      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->callerApp:Lcom/android/server/am/ProcessRecord;
 507
 508 -    move-object/from16 v0, v27
 509 +    move-object/from16 v0, v28
 510
 511      iget-object v4, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 512
 513      new-instance v5, Landroid/content/Intent;
 514
 515 -    move-object/from16 v0, v27
 516 +    move-object/from16 v0, v28
 517
 518      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 519
 520      invoke-direct {v5, v6}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 521
 522 -    move-object/from16 v0, v27
 523 +    move-object/from16 v0, v28
 524
 525      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
 526
 527 -    move-object/from16 v0, v27
 528 +    move-object/from16 v0, v28
 529
 530      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
 531
 532 -    move-object/from16 v0, v27
 533 +    move-object/from16 v0, v28
 534
 535      iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
 536
 537 @@ -2536,12 +2648,12 @@
 538
 539      const/4 v3, 0x0
 540
 541 -    move-object/from16 v0, v27
 542 +    move-object/from16 v0, v28
 543
 544      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 545      :try_end_224
 546      .catchall {:try_start_1fd .. :try_end_224} :catchall_69
 547 -    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2b0
 548 +    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2e2
 549
 550      :cond_224
 551      :goto_224
 552 @@ -2550,7 +2662,7 @@
 553
 554      move-object/from16 v0, p0
 555
 556 -    move-object/from16 v1, v27
 557 +    move-object/from16 v1, v28
 558
 559      invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
 560
 561 @@ -2562,22 +2674,22 @@
 562
 563      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 564
 565 -    const/16 v27, 0x0
 566 +    const/16 v28, 0x0
 567
 568 -    const/16 v21, 0x1
 569 +    const/16 v22, 0x1
 570
 571      :cond_23a
 572 -    if-eqz v27, :cond_e4
 573 +    if-eqz v28, :cond_e4
 574
 575 -    move-object/from16 v0, v27
 576 +    move-object/from16 v0, v28
 577
 578      iget v0, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 579
 580 -    move/from16 v28, v0
 581 +    move/from16 v29, v0
 582
 583 -    add-int/lit8 v3, v28, 0x1
 584 +    add-int/lit8 v3, v29, 0x1
 585
 586 -    move-object/from16 v0, v27
 587 +    move-object/from16 v0, v28
 588
 589      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 590
 591 @@ -2585,17 +2697,17 @@
 592
 593      move-result-wide v5
 594
 595 -    move-object/from16 v0, v27
 596 +    move-object/from16 v0, v28
 597
 598      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 599
 600 -    if-nez v28, :cond_262
 601 +    if-nez v29, :cond_262
 602
 603 -    move-object/from16 v0, v27
 604 +    move-object/from16 v0, v28
 605
 606      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 607
 608 -    move-object/from16 v0, v27
 609 +    move-object/from16 v0, v28
 610
 611      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 612
 613 @@ -2603,7 +2715,7 @@
 614
 615      move-result-wide v5
 616
 617 -    move-object/from16 v0, v27
 618 +    move-object/from16 v0, v28
 619
 620      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
 621
 622 @@ -2614,7 +2726,7 @@
 623
 624      if-nez v3, :cond_279
 625
 626 -    move-object/from16 v0, v27
 627 +    move-object/from16 v0, v28
 628
 629      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 630
 631 @@ -2622,74 +2734,126 @@
 632
 633      iget-wide v7, v0, Lcom/android/server/am/BroadcastQueue;->mTimeoutPeriod:J
 634
 635 -    add-long v32, v5, v7
 636 +    add-long v33, v5, v7
 637
 638      move-object/from16 v0, p0
 639
 640 -    move-wide/from16 v1, v32
 641 +    move-wide/from16 v1, v33
 642
 643      invoke-virtual {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->setBroadcastTimeoutLocked(J)V
 644
 645      :cond_279
 646 -    move-object/from16 v0, v27
 647 +    move-object/from16 v0, v28
 648
 649      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 650
 651 -    move/from16 v0, v28
 652 +    move/from16 v0, v29
 653
 654      invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 655
 656 -    move-result-object v22
 657 +    move-result-object v23
 658 +
 659 +    move-object/from16 v0, p0
 660 +
 661 +    move-object/from16 v1, v23
 662 +
 663 +    move-object/from16 v2, v28
 664 +
 665 +    invoke-direct {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
 666 +
 667 +    const/4 v15, 0x0
 668 +
 669 +    if-eqz v28, :cond_2b0
 670 +
 671 +    move-object/from16 v0, v28
 672 +
 673 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 674 +
 675 +    if-eqz v3, :cond_2b0
 676 +
 677 +    move-object/from16 v0, v28
 678 +
 679 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 680 +
 681 +    invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 682 +
 683 +    move-result-object v3
 684 +
 685 +    if-eqz v3, :cond_2b0
 686 +
 687 +    move-object/from16 v0, v28
 688 +
 689 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 690 +
 691 +    invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 692 +
 693 +    move-result-object v3
 694 +
 695 +    const-string v5, "catchBootComplete"
 696 +
 697 +    invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 698 +
 699 +    move-result v3
 700 +
 701 +    if-eqz v3, :cond_2b0
 702
 703 -    move-object/from16 v0, v22
 704 +    const/4 v15, 0x1
 705 +
 706 +    :cond_2b0
 707 +    move-object/from16 v0, v23
 708
 709      instance-of v3, v0, Lcom/android/server/am/BroadcastFilter;
 710
 711 -    if-eqz v3, :cond_2dd
 712 +    if-eqz v3, :cond_323
 713
 714 -    move-object/from16 v0, v22
 715 +    move-object/from16 v0, v23
 716
 717      check-cast v0, Lcom/android/server/am/BroadcastFilter;
 718
 719 -    move-object v15, v0
 720 +    move-object/from16 v16, v0
 721 +
 722 +    if-nez v15, :cond_30f
 723
 724 -    move-object/from16 v0, v27
 725 +    move-object/from16 v0, v28
 726
 727      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 728
 729      move-object/from16 v0, p0
 730
 731 -    move-object/from16 v1, v27
 732 +    move-object/from16 v1, v28
 733
 734 -    invoke-direct {v0, v1, v15, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 735 +    move-object/from16 v2, v16
 736
 737 -    move-object/from16 v0, v27
 738 +    invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 739 +
 740 +    :goto_2cb
 741 +    move-object/from16 v0, v28
 742
 743      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 744
 745 -    if-eqz v3, :cond_2a5
 746 +    if-eqz v3, :cond_2d7
 747
 748 -    move-object/from16 v0, v27
 749 +    move-object/from16 v0, v28
 750
 751      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 752
 753 -    if-nez v3, :cond_2ad
 754 +    if-nez v3, :cond_2df
 755
 756 -    :cond_2a5
 757 +    :cond_2d7
 758      const/4 v3, 0x0
 759
 760 -    move-object/from16 v0, v27
 761 +    move-object/from16 v0, v28
 762
 763      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 764
 765      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
 766
 767 -    :cond_2ad
 768 -    monitor-exit v34
 769 +    :cond_2df
 770 +    monitor-exit v35
 771
 772      goto/16 :goto_93
 773
 774 -    :catch_2b0
 775 +    :catch_2e2
 776      move-exception v14
 777
 778      const-string v3, "BroadcastQueue"
 779 @@ -2718,7 +2882,7 @@
 780
 781      move-result-object v5
 782
 783 -    move-object/from16 v0, v27
 784 +    move-object/from16 v0, v28
 785
 786      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 787
 788 @@ -2734,34 +2898,57 @@
 789
 790      goto/16 :goto_224
 791
 792 -    :cond_2dd
 793 -    move-object/from16 v0, v22
 794 +    :cond_30f
 795 +    const/4 v3, 0x0
 796 +
 797 +    move-object/from16 v0, v28
 798 +
 799 +    iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 800 +
 801 +    const/4 v3, 0x0
 802 +
 803 +    move-object/from16 v0, v28
 804 +
 805 +    iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
 806 +
 807 +    move-object/from16 v0, v28
 808 +
 809 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 810 +
 811 +    const-string v5, "android.intent.action.BOOT_COMPLETED"
 812 +
 813 +    invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 814 +
 815 +    goto :goto_2cb
 816 +
 817 +    :cond_323
 818 +    move-object/from16 v0, v23
 819
 820      check-cast v0, Landroid/content/pm/ResolveInfo;
 821
 822 -    move-object/from16 v18, v0
 823 +    move-object/from16 v19, v0
 824
 825 -    const/16 v29, 0x0
 826 +    const/16 v30, 0x0
 827
 828      move-object/from16 v0, p0
 829
 830      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 831
 832 -    move-object/from16 v0, v18
 833 +    move-object/from16 v0, v19
 834
 835      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 836
 837      iget-object v4, v5, Landroid/content/pm/ActivityInfo;->permission:Ljava/lang/String;
 838
 839 -    move-object/from16 v0, v27
 840 +    move-object/from16 v0, v28
 841
 842      iget v5, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 843
 844 -    move-object/from16 v0, v27
 845 +    move-object/from16 v0, v28
 846
 847      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 848
 849 -    move-object/from16 v0, v18
 850 +    move-object/from16 v0, v19
 851
 852      iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 853
 854 @@ -2769,7 +2956,7 @@
 855
 856      iget v7, v7, Landroid/content/pm/ApplicationInfo;->uid:I
 857
 858 -    move-object/from16 v0, v18
 859 +    move-object/from16 v0, v19
 860
 861      iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 862
 863 @@ -2777,17 +2964,17 @@
 864
 865      invoke-virtual/range {v3 .. v8}, Lcom/android/server/am/ActivityManagerService;->checkComponentPermission(Ljava/lang/String;IIIZ)I
 866
 867 -    move-result v26
 868 +    move-result v27
 869
 870 -    if-eqz v26, :cond_397
 871 +    if-eqz v27, :cond_3dd
 872
 873 -    move-object/from16 v0, v18
 874 +    move-object/from16 v0, v19
 875
 876      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 877
 878      iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
 879
 880 -    if-nez v3, :cond_446
 881 +    if-nez v3, :cond_499
 882
 883      const-string v3, "BroadcastQueue"
 884
 885 @@ -2801,7 +2988,7 @@
 886
 887      move-result-object v5
 888
 889 -    move-object/from16 v0, v27
 890 +    move-object/from16 v0, v28
 891
 892      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 893
 894 @@ -2819,7 +3006,7 @@
 895
 896      move-result-object v5
 897
 898 -    move-object/from16 v0, v27
 899 +    move-object/from16 v0, v28
 900
 901      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
 902
 903 @@ -2833,7 +3020,7 @@
 904
 905      move-result-object v5
 906
 907 -    move-object/from16 v0, v27
 908 +    move-object/from16 v0, v28
 909
 910      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 911
 912 @@ -2847,7 +3034,7 @@
 913
 914      move-result-object v5
 915
 916 -    move-object/from16 v0, v27
 917 +    move-object/from16 v0, v28
 918
 919      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 920
 921 @@ -2867,7 +3054,7 @@
 922
 923      move-result-object v5
 924
 925 -    move-object/from16 v0, v18
 926 +    move-object/from16 v0, v19
 927
 928      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 929
 930 @@ -2885,7 +3072,7 @@
 931
 932      move-result-object v5
 933
 934 -    move-object/from16 v0, v18
 935 +    move-object/from16 v0, v19
 936
 937      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 938
 939 @@ -2901,7 +3088,7 @@
 940
 941      move-result-object v5
 942
 943 -    move-object/from16 v0, v18
 944 +    move-object/from16 v0, v19
 945
 946      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 947
 948 @@ -2917,11 +3104,11 @@
 949
 950      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 951
 952 -    :goto_395
 953 -    const/16 v29, 0x1
 954 +    :goto_3db
 955 +    const/16 v30, 0x1
 956
 957 -    :cond_397
 958 -    move-object/from16 v0, v18
 959 +    :cond_3dd
 960 +    move-object/from16 v0, v19
 961
 962      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 963
 964 @@ -2931,26 +3118,26 @@
 965
 966      const/16 v5, 0x3e8
 967
 968 -    if-eq v3, v5, :cond_41f
 969 +    if-eq v3, v5, :cond_465
 970
 971 -    move-object/from16 v0, v27
 972 +    move-object/from16 v0, v28
 973
 974      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 975 -    :try_end_3a7
 976 -    .catchall {:try_start_224 .. :try_end_3a7} :catchall_69
 977 +    :try_end_3ed
 978 +    .catchall {:try_start_224 .. :try_end_3ed} :catchall_69
 979
 980 -    if-eqz v3, :cond_41f
 981 +    if-eqz v3, :cond_465
 982
 983 -    :try_start_3a9
 984 +    :try_start_3ef
 985      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 986
 987      move-result-object v3
 988
 989 -    move-object/from16 v0, v27
 990 +    move-object/from16 v0, v28
 991
 992      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 993
 994 -    move-object/from16 v0, v18
 995 +    move-object/from16 v0, v19
 996
 997      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 998
 999 @@ -2959,16 +3146,16 @@
1000      iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1001
1002      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
1003 -    :try_end_3bc
1004 -    .catchall {:try_start_3a9 .. :try_end_3bc} :catchall_69
1005 -    .catch Landroid/os/RemoteException; {:try_start_3a9 .. :try_end_3bc} :catch_4c8
1006 +    :try_end_402
1007 +    .catchall {:try_start_3ef .. :try_end_402} :catchall_69
1008 +    .catch Landroid/os/RemoteException; {:try_start_3ef .. :try_end_402} :catch_51b
1009
1010 -    move-result v26
1011 +    move-result v27
1012
1013 -    :goto_3bd
1014 -    if-eqz v26, :cond_41f
1015 +    :goto_403
1016 +    if-eqz v27, :cond_465
1017
1018 -    :try_start_3bf
1019 +    :try_start_405
1020      const-string v3, "BroadcastQueue"
1021
1022      new-instance v5, Ljava/lang/StringBuilder;
1023 @@ -2981,7 +3168,7 @@
1024
1025      move-result-object v5
1026
1027 -    move-object/from16 v0, v27
1028 +    move-object/from16 v0, v28
1029
1030      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1031
1032 @@ -2995,7 +3182,7 @@
1033
1034      move-result-object v5
1035
1036 -    move-object/from16 v0, v18
1037 +    move-object/from16 v0, v19
1038
1039      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1040
1041 @@ -3013,7 +3200,7 @@
1042
1043      move-result-object v5
1044
1045 -    move-object/from16 v0, v27
1046 +    move-object/from16 v0, v28
1047
1048      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1049
1050 @@ -3027,7 +3214,7 @@
1051
1052      move-result-object v5
1053
1054 -    move-object/from16 v0, v27
1055 +    move-object/from16 v0, v28
1056
1057      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1058
1059 @@ -3041,7 +3228,7 @@
1060
1061      move-result-object v5
1062
1063 -    move-object/from16 v0, v27
1064 +    move-object/from16 v0, v28
1065
1066      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1067
1068 @@ -3061,53 +3248,66 @@
1069
1070      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1071
1072 -    const/16 v29, 0x1
1073 +    const/16 v30, 0x1
1074
1075 -    :cond_41f
1076 -    move-object/from16 v0, v27
1077 +    :cond_465
1078 +    move-object/from16 v0, v28
1079
1080      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1081
1082 -    if-eqz v3, :cond_42f
1083 +    if-eqz v3, :cond_475
1084
1085 -    move-object/from16 v0, v27
1086 +    move-object/from16 v0, v28
1087
1088      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1089
1090      iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
1091
1092 -    if-eqz v3, :cond_42f
1093 +    if-eqz v3, :cond_475
1094 +
1095 +    const/16 v30, 0x1
1096 +
1097 +    :cond_475
1098 +    if-eqz v15, :cond_482
1099 +
1100 +    const/16 v30, 0x1
1101 +
1102 +    move-object/from16 v0, v28
1103 +
1104 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1105 +
1106 +    const-string v5, "android.intent.action.BOOT_COMPLETED"
1107
1108 -    const/16 v29, 0x1
1109 +    invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
1110
1111 -    :cond_42f
1112 -    if-eqz v29, :cond_4cd
1113 +    :cond_482
1114 +    if-eqz v30, :cond_520
1115
1116      const/4 v3, 0x0
1117
1118 -    move-object/from16 v0, v27
1119 +    move-object/from16 v0, v28
1120
1121      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
1122
1123      const/4 v3, 0x0
1124
1125 -    move-object/from16 v0, v27
1126 +    move-object/from16 v0, v28
1127
1128      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
1129
1130      const/4 v3, 0x0
1131
1132 -    move-object/from16 v0, v27
1133 +    move-object/from16 v0, v28
1134
1135      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1136
1137      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
1138
1139 -    monitor-exit v34
1140 +    monitor-exit v35
1141
1142      goto/16 :goto_93
1143
1144 -    :cond_446
1145 +    :cond_499
1146      const-string v3, "BroadcastQueue"
1147
1148      new-instance v5, Ljava/lang/StringBuilder;
1149 @@ -3120,7 +3320,7 @@
1150
1151      move-result-object v5
1152
1153 -    move-object/from16 v0, v27
1154 +    move-object/from16 v0, v28
1155
1156      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1157
1158 @@ -3138,7 +3338,7 @@
1159
1160      move-result-object v5
1161
1162 -    move-object/from16 v0, v27
1163 +    move-object/from16 v0, v28
1164
1165      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1166
1167 @@ -3152,7 +3352,7 @@
1168
1169      move-result-object v5
1170
1171 -    move-object/from16 v0, v27
1172 +    move-object/from16 v0, v28
1173
1174      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
1175
1176 @@ -3166,7 +3366,7 @@
1177
1178      move-result-object v5
1179
1180 -    move-object/from16 v0, v27
1181 +    move-object/from16 v0, v28
1182
1183      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1184
1185 @@ -3186,7 +3386,7 @@
1186
1187      move-result-object v5
1188
1189 -    move-object/from16 v0, v18
1190 +    move-object/from16 v0, v19
1191
1192      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1193
1194 @@ -3202,7 +3402,7 @@
1195
1196      move-result-object v5
1197
1198 -    move-object/from16 v0, v18
1199 +    move-object/from16 v0, v19
1200
1201      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1202
1203 @@ -3218,7 +3418,7 @@
1204
1205      move-result-object v5
1206
1207 -    move-object/from16 v0, v18
1208 +    move-object/from16 v0, v19
1209
1210      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1211
1212 @@ -3234,23 +3434,23 @@
1213
1214      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1215
1216 -    goto/16 :goto_395
1217 +    goto/16 :goto_3db
1218
1219 -    :catch_4c8
1220 +    :catch_51b
1221      move-exception v14
1222
1223 -    const/16 v26, -0x1
1224 +    const/16 v27, -0x1
1225
1226 -    goto/16 :goto_3bd
1227 +    goto/16 :goto_403
1228
1229 -    :cond_4cd
1230 +    :cond_520
1231      const/4 v3, 0x1
1232
1233 -    move-object/from16 v0, v27
1234 +    move-object/from16 v0, v28
1235
1236      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1237
1238 -    move-object/from16 v0, v18
1239 +    move-object/from16 v0, v19
1240
1241      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1242
1243 @@ -3258,7 +3458,7 @@
1244
1245      new-instance v3, Landroid/content/ComponentName;
1246
1247 -    move-object/from16 v0, v18
1248 +    move-object/from16 v0, v19
1249
1250      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1251
1252 @@ -3266,7 +3466,7 @@
1253
1254      iget-object v5, v5, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1255
1256 -    move-object/from16 v0, v18
1257 +    move-object/from16 v0, v19
1258
1259      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1260
1261 @@ -3274,29 +3474,29 @@
1262
1263      invoke-direct {v3, v5, v6}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
1264
1265 -    move-object/from16 v0, v27
1266 +    move-object/from16 v0, v28
1267
1268      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1269
1270 -    move-object/from16 v0, v27
1271 +    move-object/from16 v0, v28
1272
1273      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1274
1275      const/16 v5, 0x3e8
1276
1277 -    if-eq v3, v5, :cond_521
1278 +    if-eq v3, v5, :cond_574
1279
1280      move-object/from16 v0, p0
1281
1282      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1283
1284 -    move-object/from16 v0, v18
1285 +    move-object/from16 v0, v19
1286
1287      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1288
1289      iget-object v5, v5, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1290
1291 -    move-object/from16 v0, v18
1292 +    move-object/from16 v0, v19
1293
1294      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1295
1296 @@ -3304,48 +3504,48 @@
1297
1298      invoke-virtual {v3, v5, v6}, Lcom/android/server/am/ActivityManagerService;->isSingleton(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Z
1299
1300 -    move-result v20
1301 +    move-result v21
1302
1303 -    if-eqz v20, :cond_56a
1304 +    if-eqz v21, :cond_5bd
1305
1306 -    const/16 v31, 0x0
1307 +    const/16 v32, 0x0
1308
1309 -    :goto_50f
1310 +    :goto_562
1311      move-object/from16 v0, p0
1312
1313      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1314
1315 -    move-object/from16 v0, v18
1316 +    move-object/from16 v0, v19
1317
1318      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1319
1320 -    move/from16 v0, v31
1321 +    move/from16 v0, v32
1322
1323      invoke-virtual {v3, v5, v0}, Lcom/android/server/am/ActivityManagerService;->getActivityInfoForUser(Landroid/content/pm/ActivityInfo;I)Landroid/content/pm/ActivityInfo;
1324
1325      move-result-object v3
1326
1327 -    move-object/from16 v0, v18
1328 +    move-object/from16 v0, v19
1329
1330      iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1331
1332 -    :cond_521
1333 -    move-object/from16 v0, v18
1334 +    :cond_574
1335 +    move-object/from16 v0, v19
1336
1337      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1338
1339 -    move-object/from16 v0, v27
1340 +    move-object/from16 v0, v28
1341
1342      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
1343 -    :try_end_529
1344 -    .catchall {:try_start_3bf .. :try_end_529} :catchall_69
1345 +    :try_end_57c
1346 +    .catchall {:try_start_405 .. :try_end_57c} :catchall_69
1347
1348 -    :try_start_529
1349 +    :try_start_57c
1350      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
1351
1352      move-result-object v3
1353
1354 -    move-object/from16 v0, v27
1355 +    move-object/from16 v0, v28
1356
1357      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1358
1359 @@ -3355,7 +3555,7 @@
1360
1361      const/4 v6, 0x0
1362
1363 -    move-object/from16 v0, v27
1364 +    move-object/from16 v0, v28
1365
1366      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1367
1368 @@ -3364,18 +3564,18 @@
1369      move-result v7
1370
1371      invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
1372 -    :try_end_541
1373 -    .catchall {:try_start_529 .. :try_end_541} :catchall_69
1374 -    .catch Landroid/os/RemoteException; {:try_start_529 .. :try_end_541} :catch_671
1375 -    .catch Ljava/lang/IllegalArgumentException; {:try_start_529 .. :try_end_541} :catch_573
1376 +    :try_end_594
1377 +    .catchall {:try_start_57c .. :try_end_594} :catchall_69
1378 +    .catch Landroid/os/RemoteException; {:try_start_57c .. :try_end_594} :catch_6c4
1379 +    .catch Ljava/lang/IllegalArgumentException; {:try_start_57c .. :try_end_594} :catch_5c6
1380
1381 -    :goto_541
1382 -    :try_start_541
1383 +    :goto_594
1384 +    :try_start_594
1385      move-object/from16 v0, p0
1386
1387      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1388
1389 -    move-object/from16 v0, v18
1390 +    move-object/from16 v0, v19
1391
1392      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1393
1394 @@ -3387,16 +3587,16 @@
1395
1396      move-result-object v13
1397
1398 -    if-eqz v13, :cond_5bc
1399 +    if-eqz v13, :cond_60f
1400
1401      iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
1402 -    :try_end_555
1403 -    .catchall {:try_start_541 .. :try_end_555} :catchall_69
1404 +    :try_end_5a8
1405 +    .catchall {:try_start_594 .. :try_end_5a8} :catchall_69
1406
1407 -    if-eqz v3, :cond_5bc
1408 +    if-eqz v3, :cond_60f
1409
1410 -    :try_start_557
1411 -    move-object/from16 v0, v18
1412 +    :try_start_5aa
1413 +    move-object/from16 v0, v19
1414
1415      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1416
1417 @@ -3406,30 +3606,30 @@
1418
1419      move-object/from16 v0, p0
1420
1421 -    move-object/from16 v1, v27
1422 +    move-object/from16 v1, v28
1423
1424      invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
1425 -    :try_end_567
1426 -    .catchall {:try_start_557 .. :try_end_567} :catchall_69
1427 -    .catch Landroid/os/RemoteException; {:try_start_557 .. :try_end_567} :catch_59f
1428 +    :try_end_5ba
1429 +    .catchall {:try_start_5aa .. :try_end_5ba} :catchall_69
1430 +    .catch Landroid/os/RemoteException; {:try_start_5aa .. :try_end_5ba} :catch_5f2
1431
1432 -    :try_start_567
1433 -    monitor-exit v34
1434 +    :try_start_5ba
1435 +    monitor-exit v35
1436
1437      goto/16 :goto_93
1438
1439 -    :cond_56a
1440 -    move-object/from16 v0, v27
1441 +    :cond_5bd
1442 +    move-object/from16 v0, v28
1443
1444      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1445
1446      invoke-static {v3}, Landroid/os/UserId;->getUserId(I)I
1447
1448 -    move-result v31
1449 +    move-result v32
1450
1451 -    goto :goto_50f
1452 +    goto :goto_562
1453
1454 -    :catch_573
1455 +    :catch_5c6
1456      move-exception v14
1457
1458      const-string v3, "BroadcastQueue"
1459 @@ -3444,7 +3644,7 @@
1460
1461      move-result-object v5
1462
1463 -    move-object/from16 v0, v27
1464 +    move-object/from16 v0, v28
1465
1466      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1467
1468 @@ -3472,9 +3672,9 @@
1469
1470      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1471
1472 -    goto :goto_541
1473 +    goto :goto_594
1474
1475 -    :catch_59f
1476 +    :catch_5f2
1477      move-exception v14
1478
1479      const-string v3, "BroadcastQueue"
1480 @@ -3489,7 +3689,7 @@
1481
1482      move-result-object v5
1483
1484 -    move-object/from16 v0, v27
1485 +    move-object/from16 v0, v28
1486
1487      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1488
1489 @@ -3503,12 +3703,12 @@
1490
1491      invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1492
1493 -    :cond_5bc
1494 +    :cond_60f
1495      move-object/from16 v0, p0
1496
1497      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1498
1499 -    move-object/from16 v0, v18
1500 +    move-object/from16 v0, v19
1501
1502      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1503
1504 @@ -3516,7 +3716,7 @@
1505
1506      const/4 v6, 0x1
1507
1508 -    move-object/from16 v0, v27
1509 +    move-object/from16 v0, v28
1510
1511      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1512
1513 @@ -3528,11 +3728,11 @@
1514
1515      const-string v8, "broadcast"
1516
1517 -    move-object/from16 v0, v27
1518 +    move-object/from16 v0, v28
1519
1520      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1521
1522 -    move-object/from16 v0, v27
1523 +    move-object/from16 v0, v28
1524
1525      iget-object v10, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1526
1527 @@ -3544,22 +3744,22 @@
1528
1529      and-int/2addr v10, v11
1530
1531 -    if-eqz v10, :cond_660
1532 +    if-eqz v10, :cond_6b3
1533
1534      const/4 v10, 0x1
1535
1536 -    :goto_5e5
1537 +    :goto_638
1538      const/4 v11, 0x0
1539
1540      invoke-virtual/range {v3 .. v11}, Lcom/android/server/am/ActivityManagerService;->startProcessLocked(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;ZILjava/lang/String;Landroid/content/ComponentName;ZZ)Lcom/android/server/am/ProcessRecord;
1541
1542      move-result-object v3
1543
1544 -    move-object/from16 v0, v27
1545 +    move-object/from16 v0, v28
1546
1547      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1548
1549 -    if-nez v3, :cond_662
1550 +    if-nez v3, :cond_6b5
1551
1552      const-string v3, "BroadcastQueue"
1553
1554 @@ -3573,7 +3773,7 @@
1555
1556      move-result-object v5
1557
1558 -    move-object/from16 v0, v18
1559 +    move-object/from16 v0, v19
1560
1561      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1562
1563 @@ -3591,7 +3791,7 @@
1564
1565      move-result-object v5
1566
1567 -    move-object/from16 v0, v18
1568 +    move-object/from16 v0, v19
1569
1570      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1571
1572 @@ -3609,7 +3809,7 @@
1573
1574      move-result-object v5
1575
1576 -    move-object/from16 v0, v27
1577 +    move-object/from16 v0, v28
1578
1579      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1580
1581 @@ -3631,23 +3831,23 @@
1582
1583      move-object/from16 v0, p0
1584
1585 -    move-object/from16 v1, v27
1586 +    move-object/from16 v1, v28
1587
1588      invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1589
1590 -    move-object/from16 v0, v27
1591 +    move-object/from16 v0, v28
1592
1593      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1594
1595 -    move-object/from16 v0, v27
1596 +    move-object/from16 v0, v28
1597
1598      iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1599
1600 -    move-object/from16 v0, v27
1601 +    move-object/from16 v0, v28
1602
1603      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1604
1605 -    move-object/from16 v0, v27
1606 +    move-object/from16 v0, v28
1607
1608      iget-boolean v10, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1609
1610 @@ -3655,7 +3855,7 @@
1611
1612      move-object/from16 v5, p0
1613
1614 -    move-object/from16 v6, v27
1615 +    move-object/from16 v6, v28
1616
1617      invoke-virtual/range {v5 .. v11}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1618
1619 @@ -3663,42 +3863,42 @@
1620
1621      const/4 v3, 0x0
1622
1623 -    move-object/from16 v0, v27
1624 +    move-object/from16 v0, v28
1625
1626      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1627
1628 -    monitor-exit v34
1629 +    monitor-exit v35
1630
1631      goto/16 :goto_93
1632
1633 -    :cond_660
1634 +    :cond_6b3
1635      const/4 v10, 0x0
1636
1637 -    goto :goto_5e5
1638 +    goto :goto_638
1639
1640 -    :cond_662
1641 -    move-object/from16 v0, v27
1642 +    :cond_6b5
1643 +    move-object/from16 v0, v28
1644
1645      move-object/from16 v1, p0
1646
1647      iput-object v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
1648
1649 -    move/from16 v0, v28
1650 +    move/from16 v0, v29
1651
1652      move-object/from16 v1, p0
1653
1654      iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
1655
1656 -    monitor-exit v34
1657 -    :try_end_66f
1658 -    .catchall {:try_start_567 .. :try_end_66f} :catchall_69
1659 +    monitor-exit v35
1660 +    :try_end_6c2
1661 +    .catchall {:try_start_5ba .. :try_end_6c2} :catchall_69
1662
1663      goto/16 :goto_93
1664
1665 -    :catch_671
1666 +    :catch_6c4
1667      move-exception v3
1668
1669 -    goto/16 :goto_541
1670 +    goto/16 :goto_594
1671  .end method
1672
1673  .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
1674 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali opd-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali
1675 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali    1969-12-31 18:00:00.000000000 -0600
1676 +++ opd-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali      2013-01-09 03:21:56.564227703 -0600
1677 @@ -0,0 +1,180 @@
1678 +.class Lcom/android/server/PrivacyTelephonyRegistry$1;
1679 +.super Landroid/content/BroadcastReceiver;
1680 +.source "PrivacyTelephonyRegistry.java"
1681 +
1682 +
1683 +# annotations
1684 +.annotation system Ldalvik/annotation/EnclosingClass;
1685 +    value = Lcom/android/server/PrivacyTelephonyRegistry;
1686 +.end annotation
1687 +
1688 +.annotation system Ldalvik/annotation/InnerClass;
1689 +    accessFlags = 0x0
1690 +    name = null
1691 +.end annotation
1692 +
1693 +
1694 +# instance fields
1695 +.field final synthetic this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1696 +
1697 +
1698 +# direct methods
1699 +.method constructor <init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1700 +    .registers 2
1701 +
1702 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1703 +
1704 +    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
1705 +
1706 +    return-void
1707 +.end method
1708 +
1709 +
1710 +# virtual methods
1711 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
1712 +    .registers 10
1713 +
1714 +    const/4 v6, 0x0
1715 +
1716 +    invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
1717 +
1718 +    move-result-object v3
1719 +
1720 +    const-string v4, "android.privacy.BLOCKED_PHONE_CALL"
1721 +
1722 +    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1723 +
1724 +    move-result v3
1725 +
1726 +    if-eqz v3, :cond_44
1727 +
1728 +    new-instance v0, Landroid/os/Bundle;
1729 +
1730 +    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
1731 +
1732 +    invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
1733 +
1734 +    move-result-object v0
1735 +
1736 +    const-string v3, "packageName"
1737 +
1738 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1739 +
1740 +    move-result-object v1
1741 +
1742 +    const-string v3, "packageName"
1743 +
1744 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1745 +
1746 +    move-result v3
1747 +
1748 +    if-eqz v3, :cond_45
1749 +
1750 +    const-string v3, "PrivacyTelephonyRegistry"
1751 +
1752 +    new-instance v4, Ljava/lang/StringBuilder;
1753 +
1754 +    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
1755 +
1756 +    const-string v5, "got blocked phone call INTENT from package: "
1757 +
1758 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1759 +
1760 +    move-result-object v4
1761 +
1762 +    const-string v5, "packageName"
1763 +
1764 +    invoke-virtual {v0, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1765 +
1766 +    move-result-object v5
1767 +
1768 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1769 +
1770 +    move-result-object v4
1771 +
1772 +    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1773 +
1774 +    move-result-object v4
1775 +
1776 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1777 +
1778 +    :goto_42
1779 +    if-nez v1, :cond_4d
1780 +
1781 +    :cond_44
1782 +    :goto_44
1783 +    return-void
1784 +
1785 +    :cond_45
1786 +    const-string v3, "PrivacyTelephonyRegistry"
1787 +
1788 +    const-string v4, "got blocked phone call INTENT without package information"
1789 +
1790 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1791 +
1792 +    goto :goto_42
1793 +
1794 +    :cond_4d
1795 +    const-string v3, "phoneState"
1796 +
1797 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1798 +
1799 +    move-result v3
1800 +
1801 +    if-eqz v3, :cond_76
1802 +
1803 +    const-string v3, "phoneState"
1804 +
1805 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
1806 +
1807 +    move-result v2
1808 +
1809 +    packed-switch v2, :pswitch_data_7e
1810 +
1811 +    goto :goto_44
1812 +
1813 +    :pswitch_5f
1814 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1815 +
1816 +    const/4 v4, 0x0
1817 +
1818 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1819 +
1820 +    goto :goto_44
1821 +
1822 +    :pswitch_66
1823 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1824 +
1825 +    const/4 v4, 0x2
1826 +
1827 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1828 +
1829 +    goto :goto_44
1830 +
1831 +    :pswitch_6d
1832 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1833 +
1834 +    const/4 v4, 0x1
1835 +
1836 +    const-string v5, "12345"
1837 +
1838 +    invoke-virtual {v3, v4, v5, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1839 +
1840 +    goto :goto_44
1841 +
1842 +    :cond_76
1843 +    const-string v3, "PrivacyTelephonyRegistry"
1844 +
1845 +    const-string v4, "we forgot to put phoneState in Intent?"
1846 +
1847 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1848 +
1849 +    goto :goto_44
1850 +
1851 +    :pswitch_data_7e
1852 +    .packed-switch 0x0
1853 +        :pswitch_5f
1854 +        :pswitch_6d
1855 +        :pswitch_66
1856 +    .end packed-switch
1857 +.end method
1858 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali opd-services/smali/com/android/server/PrivacyTelephonyRegistry.smali
1859 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali      1969-12-31 18:00:00.000000000 -0600
1860 +++ opd-services/smali/com/android/server/PrivacyTelephonyRegistry.smali        2013-01-09 03:21:56.600227882 -0600
1861 @@ -0,0 +1,1410 @@
1862 +.class public Lcom/android/server/PrivacyTelephonyRegistry;
1863 +.super Lcom/android/server/TelephonyRegistry;
1864 +.source "PrivacyTelephonyRegistry.java"
1865 +
1866 +
1867 +# static fields
1868 +.field private static final PERMISSION_CALL_STATE:I = 0x3
1869 +
1870 +.field private static final PERMISSION_CELL_INFO:I = 0x1
1871 +
1872 +.field private static final PERMISSION_CELL_LOCATION:I = 0x0
1873 +
1874 +.field private static final PERMISSION_SERVICE_STATE:I = 0x4
1875 +
1876 +.field private static final PERMISSION_SIGNAL_STRENGTH:I = 0x2
1877 +
1878 +.field private static final P_TAG:Ljava/lang/String; = "PrivacyTelephonyRegistry"
1879 +
1880 +
1881 +# instance fields
1882 +.field private pSetMan:Landroid/privacy/PrivacySettingsManager;
1883 +
1884 +.field private final privacyReceiver:Landroid/content/BroadcastReceiver;
1885 +
1886 +
1887 +# direct methods
1888 +.method public constructor <init>(Landroid/content/Context;)V
1889 +    .registers 5
1890 +
1891 +    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
1892 +
1893 +    new-instance v1, Lcom/android/server/PrivacyTelephonyRegistry$1;
1894 +
1895 +    invoke-direct {v1, p0}, Lcom/android/server/PrivacyTelephonyRegistry$1;-><init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1896 +
1897 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
1898 +
1899 +    new-instance v1, Landroid/privacy/PrivacySettingsManager;
1900 +
1901 +    const-string v2, "privacy"
1902 +
1903 +    invoke-static {v2}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
1904 +
1905 +    move-result-object v2
1906 +
1907 +    invoke-static {v2}, Landroid/privacy/IPrivacySettingsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/privacy/IPrivacySettingsManager;
1908 +
1909 +    move-result-object v2
1910 +
1911 +    invoke-direct {v1, p1, v2}, Landroid/privacy/PrivacySettingsManager;-><init>(Landroid/content/Context;Landroid/privacy/IPrivacySettingsManager;)V
1912 +
1913 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1914 +
1915 +    :try_start_1b
1916 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
1917 +    :try_end_1e
1918 +    .catch Ljava/lang/Exception; {:try_start_1b .. :try_end_1e} :catch_26
1919 +
1920 +    :goto_1e
1921 +    const-string v1, "PrivacyTelephonyRegistry"
1922 +
1923 +    const-string v2, "constructor ready"
1924 +
1925 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1926 +
1927 +    return-void
1928 +
1929 +    :catch_26
1930 +    move-exception v0
1931 +
1932 +    const-string v1, "PrivacyTelephonyRegistry"
1933 +
1934 +    const-string v2, "failed to register privacy broadcastreceiver"
1935 +
1936 +    invoke-static {v1, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
1937 +
1938 +    goto :goto_1e
1939 +.end method
1940 +
1941 +.method private isPackageAllowed(ILjava/lang/String;)Z
1942 +    .registers 8
1943 +
1944 +    const/4 v2, 0x1
1945 +
1946 +    const/4 v1, 0x0
1947 +
1948 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1949 +
1950 +    invoke-static {}, Landroid/os/Process;->myUid()I
1951 +
1952 +    move-result v4
1953 +
1954 +    invoke-virtual {v3, p2, v4}, Landroid/privacy/PrivacySettingsManager;->getSettings(Ljava/lang/String;I)Landroid/privacy/PrivacySettings;
1955 +
1956 +    move-result-object v0
1957 +
1958 +    if-nez v0, :cond_f
1959 +
1960 +    :cond_e
1961 +    :goto_e
1962 +    return v1
1963 +
1964 +    :cond_f
1965 +    packed-switch p1, :pswitch_data_42
1966 +
1967 +    goto :goto_e
1968 +
1969 +    :pswitch_13
1970 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1971 +
1972 +    move-result v3
1973 +
1974 +    if-nez v3, :cond_e
1975 +
1976 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationGpsSetting()B
1977 +
1978 +    move-result v3
1979 +
1980 +    if-nez v3, :cond_e
1981 +
1982 +    move v1, v2
1983 +
1984 +    goto :goto_e
1985 +
1986 +    :pswitch_21
1987 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1988 +
1989 +    move-result v3
1990 +
1991 +    if-nez v3, :cond_e
1992 +
1993 +    move v1, v2
1994 +
1995 +    goto :goto_e
1996 +
1997 +    :pswitch_29
1998 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1999 +
2000 +    move-result v3
2001 +
2002 +    if-nez v3, :cond_e
2003 +
2004 +    move v1, v2
2005 +
2006 +    goto :goto_e
2007 +
2008 +    :pswitch_31
2009 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2010 +
2011 +    move-result v3
2012 +
2013 +    if-nez v3, :cond_e
2014 +
2015 +    move v1, v2
2016 +
2017 +    goto :goto_e
2018 +
2019 +    :pswitch_39
2020 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2021 +
2022 +    move-result v3
2023 +
2024 +    if-nez v3, :cond_e
2025 +
2026 +    move v1, v2
2027 +
2028 +    goto :goto_e
2029 +
2030 +    nop
2031 +
2032 +    :pswitch_data_42
2033 +    .packed-switch 0x0
2034 +        :pswitch_13
2035 +        :pswitch_21
2036 +        :pswitch_29
2037 +        :pswitch_31
2038 +        :pswitch_39
2039 +    .end packed-switch
2040 +.end method
2041 +
2042 +.method private registerPrivacy()V
2043 +    .registers 4
2044 +
2045 +    new-instance v0, Landroid/content/IntentFilter;
2046 +
2047 +    const-string v1, "android.privacy.BLOCKED_PHONE_CALL"
2048 +
2049 +    invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
2050 +
2051 +    iget-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mContext:Landroid/content/Context;
2052 +
2053 +    iget-object v2, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2054 +
2055 +    invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
2056 +
2057 +    return-void
2058 +.end method
2059 +
2060 +
2061 +# virtual methods
2062 +.method public bridge synthetic dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2063 +    .registers 4
2064 +
2065 +    invoke-super {p0, p1, p2, p3}, Lcom/android/server/TelephonyRegistry;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2066 +
2067 +    return-void
2068 +.end method
2069 +
2070 +.method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
2071 +    .registers 19
2072 +
2073 +    :try_start_0
2074 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2075 +    :try_end_3
2076 +    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_3} :catch_af
2077 +
2078 +    :goto_3
2079 +    if-eqz p3, :cond_110
2080 +
2081 +    move/from16 v0, p3
2082 +
2083 +    invoke-virtual {p0, v0}, Lcom/android/server/PrivacyTelephonyRegistry;->checkListenerPermission(I)V
2084 +
2085 +    iget-object v11, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2086 +
2087 +    monitor-enter v11
2088 +
2089 +    const/4 v7, 0x0
2090 +
2091 +    :try_start_e
2092 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2093 +
2094 +    move-result-object v2
2095 +
2096 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2097 +
2098 +    invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
2099 +    :try_end_17
2100 +    .catchall {:try_start_e .. :try_end_17} :catchall_d2
2101 +
2102 +    move-result v1
2103 +
2104 +    const/4 v6, 0x0
2105 +
2106 +    move-object v8, v7
2107 +
2108 +    :goto_1a
2109 +    if-ge v6, v1, :cond_be
2110 +
2111 +    :try_start_1c
2112 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2113 +
2114 +    invoke-virtual {v10, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
2115 +
2116 +    move-result-object v7
2117 +
2118 +    check-cast v7, Lcom/android/server/TelephonyRegistry$Record;
2119 +    :try_end_24
2120 +    .catchall {:try_start_1c .. :try_end_24} :catchall_118
2121 +
2122 +    :try_start_24
2123 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2124 +
2125 +    if-ne v2, v10, :cond_b9
2126 +
2127 +    :goto_28
2128 +    iget v10, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2129 +
2130 +    xor-int v10, v10, p3
2131 +
2132 +    and-int v9, p3, v10
2133 +
2134 +    move/from16 v0, p3
2135 +
2136 +    iput v0, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2137 +    :try_end_32
2138 +    .catchall {:try_start_24 .. :try_end_32} :catchall_d2
2139 +
2140 +    if-eqz p4, :cond_ad
2141 +
2142 +    and-int/lit8 v10, p3, 0x1
2143 +
2144 +    if-eqz v10, :cond_38
2145 +
2146 +    :cond_38
2147 +    and-int/lit8 v10, p3, 0x2
2148 +
2149 +    if-eqz v10, :cond_4c
2150 +
2151 +    :try_start_3c
2152 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2153 +
2154 +    invoke-virtual {v10}, Landroid/telephony/SignalStrength;->getGsmSignalStrength()I
2155 +
2156 +    move-result v5
2157 +
2158 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2159 +
2160 +    const/16 v12, 0x63
2161 +
2162 +    if-ne v5, v12, :cond_49
2163 +
2164 +    const/4 v5, -0x1
2165 +
2166 +    :cond_49
2167 +    invoke-interface {v10, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
2168 +    :try_end_4c
2169 +    .catchall {:try_start_3c .. :try_end_4c} :catchall_d2
2170 +    .catch Landroid/os/RemoteException; {:try_start_3c .. :try_end_4c} :catch_d5
2171 +
2172 +    :cond_4c
2173 +    :goto_4c
2174 +    and-int/lit8 v10, p3, 0x4
2175 +
2176 +    if-eqz v10, :cond_57
2177 +
2178 +    :try_start_50
2179 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2180 +
2181 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mMessageWaiting:Z
2182 +
2183 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
2184 +    :try_end_57
2185 +    .catchall {:try_start_50 .. :try_end_57} :catchall_d2
2186 +    .catch Landroid/os/RemoteException; {:try_start_50 .. :try_end_57} :catch_dd
2187 +
2188 +    :cond_57
2189 +    :goto_57
2190 +    and-int/lit8 v10, p3, 0x8
2191 +
2192 +    if-eqz v10, :cond_62
2193 +
2194 +    :try_start_5b
2195 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2196 +
2197 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallForwarding:Z
2198 +
2199 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
2200 +    :try_end_62
2201 +    .catchall {:try_start_5b .. :try_end_62} :catchall_d2
2202 +    .catch Landroid/os/RemoteException; {:try_start_5b .. :try_end_62} :catch_e5
2203 +
2204 +    :cond_62
2205 +    :goto_62
2206 +    and-int/lit8 v10, p3, 0x10
2207 +
2208 +    if-eqz v10, :cond_66
2209 +
2210 +    :cond_66
2211 +    and-int/lit8 v10, p3, 0x20
2212 +
2213 +    if-eqz v10, :cond_73
2214 +
2215 +    :try_start_6a
2216 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2217 +
2218 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallState:I
2219 +
2220 +    iget-object v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallIncomingNumber:Ljava/lang/String;
2221 +
2222 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
2223 +    :try_end_73
2224 +    .catchall {:try_start_6a .. :try_end_73} :catchall_d2
2225 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_73} :catch_ed
2226 +
2227 +    :cond_73
2228 +    :goto_73
2229 +    and-int/lit8 v10, p3, 0x40
2230 +
2231 +    if-eqz v10, :cond_80
2232 +
2233 +    :try_start_77
2234 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2235 +
2236 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionState:I
2237 +
2238 +    iget v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionNetworkType:I
2239 +
2240 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
2241 +    :try_end_80
2242 +    .catchall {:try_start_77 .. :try_end_80} :catchall_d2
2243 +    .catch Landroid/os/RemoteException; {:try_start_77 .. :try_end_80} :catch_f4
2244 +
2245 +    :cond_80
2246 +    :goto_80
2247 +    move/from16 v0, p3
2248 +
2249 +    and-int/lit16 v10, v0, 0x80
2250 +
2251 +    if-eqz v10, :cond_8d
2252 +
2253 +    :try_start_86
2254 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2255 +
2256 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataActivity:I
2257 +
2258 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
2259 +    :try_end_8d
2260 +    .catchall {:try_start_86 .. :try_end_8d} :catchall_d2
2261 +    .catch Landroid/os/RemoteException; {:try_start_86 .. :try_end_8d} :catch_fb
2262 +
2263 +    :cond_8d
2264 +    :goto_8d
2265 +    move/from16 v0, p3
2266 +
2267 +    and-int/lit16 v10, v0, 0x100
2268 +
2269 +    if-eqz v10, :cond_9a
2270 +
2271 +    :try_start_93
2272 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2273 +
2274 +    iget-object v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2275 +
2276 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
2277 +    :try_end_9a
2278 +    .catchall {:try_start_93 .. :try_end_9a} :catchall_d2
2279 +    .catch Landroid/os/RemoteException; {:try_start_93 .. :try_end_9a} :catch_102
2280 +
2281 +    :cond_9a
2282 +    :goto_9a
2283 +    move/from16 v0, p3
2284 +
2285 +    and-int/lit16 v10, v0, 0x200
2286 +
2287 +    if-eqz v10, :cond_a7
2288 +
2289 +    :try_start_a0
2290 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2291 +
2292 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mOtaspMode:I
2293 +
2294 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
2295 +    :try_end_a7
2296 +    .catchall {:try_start_a0 .. :try_end_a7} :catchall_d2
2297 +    .catch Landroid/os/RemoteException; {:try_start_a0 .. :try_end_a7} :catch_109
2298 +
2299 +    :cond_a7
2300 +    :goto_a7
2301 +    move/from16 v0, p3
2302 +
2303 +    and-int/lit16 v10, v0, 0x400
2304 +
2305 +    if-eqz v10, :cond_ad
2306 +
2307 +    :cond_ad
2308 +    :try_start_ad
2309 +    monitor-exit v11
2310 +    :try_end_ae
2311 +    .catchall {:try_start_ad .. :try_end_ae} :catchall_d2
2312 +
2313 +    :goto_ae
2314 +    return-void
2315 +
2316 +    :catch_af
2317 +    move-exception v3
2318 +
2319 +    const-string v10, "PrivacyTelephonyRegistry"
2320 +
2321 +    const-string v11, "failed to register privacy broadcastreceiver"
2322 +
2323 +    invoke-static {v10, v11}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2324 +
2325 +    goto/16 :goto_3
2326 +
2327 +    :cond_b9
2328 +    add-int/lit8 v6, v6, 0x1
2329 +
2330 +    move-object v8, v7
2331 +
2332 +    goto/16 :goto_1a
2333 +
2334 +    :cond_be
2335 +    :try_start_be
2336 +    new-instance v7, Lcom/android/server/TelephonyRegistry$Record;
2337 +
2338 +    invoke-direct {v7}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
2339 +    :try_end_c3
2340 +    .catchall {:try_start_be .. :try_end_c3} :catchall_118
2341 +
2342 +    :try_start_c3
2343 +    iput-object v2, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2344 +
2345 +    move-object/from16 v0, p2
2346 +
2347 +    iput-object v0, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2348 +
2349 +    iput-object p1, v7, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2350 +
2351 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2352 +
2353 +    invoke-virtual {v10, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2354 +
2355 +    goto/16 :goto_28
2356 +
2357 +    :catchall_d2
2358 +    move-exception v10
2359 +
2360 +    :goto_d3
2361 +    monitor-exit v11
2362 +    :try_end_d4
2363 +    .catchall {:try_start_c3 .. :try_end_d4} :catchall_d2
2364 +
2365 +    throw v10
2366 +
2367 +    :catch_d5
2368 +    move-exception v4
2369 +
2370 +    :try_start_d6
2371 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2372 +
2373 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2374 +
2375 +    goto/16 :goto_4c
2376 +
2377 +    :catch_dd
2378 +    move-exception v4
2379 +
2380 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2381 +
2382 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2383 +
2384 +    goto/16 :goto_57
2385 +
2386 +    :catch_e5
2387 +    move-exception v4
2388 +
2389 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2390 +
2391 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2392 +
2393 +    goto/16 :goto_62
2394 +
2395 +    :catch_ed
2396 +    move-exception v4
2397 +
2398 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2399 +
2400 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2401 +
2402 +    goto :goto_73
2403 +
2404 +    :catch_f4
2405 +    move-exception v4
2406 +
2407 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2408 +
2409 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2410 +
2411 +    goto :goto_80
2412 +
2413 +    :catch_fb
2414 +    move-exception v4
2415 +
2416 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2417 +
2418 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2419 +
2420 +    goto :goto_8d
2421 +
2422 +    :catch_102
2423 +    move-exception v4
2424 +
2425 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2426 +
2427 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2428 +
2429 +    goto :goto_9a
2430 +
2431 +    :catch_109
2432 +    move-exception v4
2433 +
2434 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2435 +
2436 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2437 +    :try_end_10f
2438 +    .catchall {:try_start_d6 .. :try_end_10f} :catchall_d2
2439 +
2440 +    goto :goto_a7
2441 +
2442 +    :cond_110
2443 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2444 +
2445 +    move-result-object v10
2446 +
2447 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2448 +
2449 +    goto :goto_ae
2450 +
2451 +    :catchall_118
2452 +    move-exception v10
2453 +
2454 +    move-object v7, v8
2455 +
2456 +    goto :goto_d3
2457 +.end method
2458 +
2459 +.method public bridge synthetic notifyCallForwardingChanged(Z)V
2460 +    .registers 2
2461 +
2462 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyCallForwardingChanged(Z)V
2463 +
2464 +    return-void
2465 +.end method
2466 +
2467 +.method public bridge synthetic notifyCallState(ILjava/lang/String;)V
2468 +    .registers 3
2469 +
2470 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
2471 +
2472 +    return-void
2473 +.end method
2474 +
2475 +.method public notifyCellInfo(Landroid/telephony/CellInfo;)V
2476 +    .registers 24
2477 +
2478 +    const-string v2, "notifyCellInfo()"
2479 +
2480 +    move-object/from16 v0, p0
2481 +
2482 +    invoke-virtual {v0, v2}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2483 +
2484 +    move-result v2
2485 +
2486 +    if-nez v2, :cond_b
2487 +
2488 +    :goto_a
2489 +    return-void
2490 +
2491 +    :cond_b
2492 +    move-object/from16 v0, p0
2493 +
2494 +    iget-object v15, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2495 +
2496 +    monitor-enter v15
2497 +
2498 +    :try_start_10
2499 +    move-object/from16 v0, p1
2500 +
2501 +    move-object/from16 v1, p0
2502 +
2503 +    iput-object v0, v1, Lcom/android/server/PrivacyTelephonyRegistry;->mCellInfo:Landroid/telephony/CellInfo;
2504 +
2505 +    move-object/from16 v0, p0
2506 +
2507 +    iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2508 +
2509 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2510 +
2511 +    move-result-object v13
2512 +
2513 +    :cond_1e
2514 +    :goto_1e
2515 +    invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z
2516 +
2517 +    move-result v2
2518 +
2519 +    if-eqz v2, :cond_cb
2520 +
2521 +    invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2522 +
2523 +    move-result-object v14
2524 +
2525 +    check-cast v14, Lcom/android/server/TelephonyRegistry$Record;
2526 +
2527 +    iget v2, v14, Lcom/android/server/TelephonyRegistry$Record;->events:I
2528 +    :try_end_2c
2529 +    .catchall {:try_start_10 .. :try_end_2c} :catchall_9a
2530 +
2531 +    and-int/lit16 v2, v2, 0x400
2532 +
2533 +    if-eqz v2, :cond_1e
2534 +
2535 +    const/4 v2, 0x1
2536 +
2537 +    :try_start_31
2538 +    iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2539 +
2540 +    move-object/from16 v0, p0
2541 +
2542 +    invoke-direct {v0, v2, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2543 +
2544 +    move-result v2
2545 +
2546 +    if-nez v2, :cond_9d
2547 +
2548 +    iget-object v0, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2549 +
2550 +    move-object/from16 v16, v0
2551 +
2552 +    new-instance v17, Landroid/telephony/CellInfo;
2553 +
2554 +    const/4 v11, 0x0
2555 +
2556 +    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2557 +
2558 +    move-result-wide v18
2559 +
2560 +    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2561 +
2562 +    move-result-wide v20
2563 +
2564 +    const/4 v9, 0x1
2565 +
2566 +    new-instance v10, Landroid/telephony/SignalStrength;
2567 +
2568 +    invoke-direct {v10}, Landroid/telephony/SignalStrength;-><init>()V
2569 +
2570 +    new-instance v2, Landroid/telephony/GsmCellIdentity;
2571 +
2572 +    const/16 v3, 0xb
2573 +
2574 +    const/16 v4, 0xb
2575 +
2576 +    const/16 v5, 0x225
2577 +
2578 +    const/16 v6, 0x221
2579 +
2580 +    const/4 v7, 0x2
2581 +
2582 +    const-string v8, "unknown"
2583 +
2584 +    invoke-direct/range {v2 .. v8}, Landroid/telephony/GsmCellIdentity;-><init>(IIIIILjava/lang/String;)V
2585 +
2586 +    move-object/from16 v3, v17
2587 +
2588 +    move v4, v11
2589 +
2590 +    move-wide/from16 v5, v18
2591 +
2592 +    move-wide/from16 v7, v20
2593 +
2594 +    move-object v11, v2
2595 +
2596 +    invoke-direct/range {v3 .. v11}, Landroid/telephony/CellInfo;-><init>(IJJZLandroid/telephony/SignalStrength;Landroid/telephony/CellIdentity;)V
2597 +
2598 +    invoke-interface/range {v16 .. v17}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2599 +
2600 +    const-string v2, "PrivacyTelephonyRegistry"
2601 +
2602 +    new-instance v3, Ljava/lang/StringBuilder;
2603 +
2604 +    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2605 +
2606 +    const-string v4, "package: "
2607 +
2608 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2609 +
2610 +    move-result-object v3
2611 +
2612 +    iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2613 +
2614 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2615 +
2616 +    move-result-object v3
2617 +
2618 +    const-string v4, " blocked for Cellinfo"
2619 +
2620 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2621 +
2622 +    move-result-object v3
2623 +
2624 +    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2625 +
2626 +    move-result-object v3
2627 +
2628 +    invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2629 +    :try_end_8e
2630 +    .catchall {:try_start_31 .. :try_end_8e} :catchall_9a
2631 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_8e} :catch_8f
2632 +
2633 +    goto :goto_1e
2634 +
2635 +    :catch_8f
2636 +    move-exception v12
2637 +
2638 +    :try_start_90
2639 +    move-object/from16 v0, p0
2640 +
2641 +    iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2642 +
2643 +    iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2644 +
2645 +    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2646 +
2647 +    goto :goto_1e
2648 +
2649 +    :catchall_9a
2650 +    move-exception v2
2651 +
2652 +    monitor-exit v15
2653 +    :try_end_9c
2654 +    .catchall {:try_start_90 .. :try_end_9c} :catchall_9a
2655 +
2656 +    throw v2
2657 +
2658 +    :cond_9d
2659 +    :try_start_9d
2660 +    iget-object v2, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2661 +
2662 +    new-instance v3, Landroid/telephony/CellInfo;
2663 +
2664 +    move-object/from16 v0, p1
2665 +
2666 +    invoke-direct {v3, v0}, Landroid/telephony/CellInfo;-><init>(Landroid/telephony/CellInfo;)V
2667 +
2668 +    invoke-interface {v2, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2669 +
2670 +    const-string v2, "PrivacyTelephonyRegistry"
2671 +
2672 +    new-instance v3, Ljava/lang/StringBuilder;
2673 +
2674 +    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2675 +
2676 +    const-string v4, "package: "
2677 +
2678 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2679 +
2680 +    move-result-object v3
2681 +
2682 +    iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2683 +
2684 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2685 +
2686 +    move-result-object v3
2687 +
2688 +    const-string v4, " allowed for Cellinfo"
2689 +
2690 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2691 +
2692 +    move-result-object v3
2693 +
2694 +    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2695 +
2696 +    move-result-object v3
2697 +
2698 +    invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2699 +    :try_end_c9
2700 +    .catchall {:try_start_9d .. :try_end_c9} :catchall_9a
2701 +    .catch Landroid/os/RemoteException; {:try_start_9d .. :try_end_c9} :catch_8f
2702 +
2703 +    goto/16 :goto_1e
2704 +
2705 +    :cond_cb
2706 +    :try_start_cb
2707 +    invoke-virtual/range {p0 .. p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2708 +
2709 +    monitor-exit v15
2710 +    :try_end_cf
2711 +    .catchall {:try_start_cb .. :try_end_cf} :catchall_9a
2712 +
2713 +    goto/16 :goto_a
2714 +.end method
2715 +
2716 +.method public notifyCellLocation(Landroid/os/Bundle;)V
2717 +    .registers 14
2718 +
2719 +    const-string v8, "notifyCellLocation()"
2720 +
2721 +    invoke-virtual {p0, v8}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2722 +
2723 +    move-result v8
2724 +
2725 +    if-nez v8, :cond_9
2726 +
2727 +    :goto_8
2728 +    return-void
2729 +
2730 +    :cond_9
2731 +    iget-object v9, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2732 +
2733 +    monitor-enter v9
2734 +
2735 +    :try_start_c
2736 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
2737 +    :try_end_e
2738 +    .catchall {:try_start_c .. :try_end_e} :catchall_7f
2739 +
2740 +    const/4 v4, 0x0
2741 +
2742 +    const/4 v2, 0x0
2743 +
2744 +    :try_start_10
2745 +    const-string v8, "lac"
2746 +
2747 +    invoke-virtual {p1, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
2748 +    :try_end_15
2749 +    .catchall {:try_start_10 .. :try_end_15} :catchall_7f
2750 +    .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_15} :catch_84
2751 +
2752 +    move-result v8
2753 +
2754 +    if-eqz v8, :cond_82
2755 +
2756 +    const/4 v4, 0x0
2757 +
2758 +    :goto_19
2759 +    :try_start_19
2760 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2761 +
2762 +    invoke-virtual {v8}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2763 +
2764 +    move-result-object v3
2765 +
2766 +    :cond_1f
2767 +    :goto_1f
2768 +    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2769 +
2770 +    move-result v8
2771 +
2772 +    if-eqz v8, :cond_bc
2773 +
2774 +    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2775 +
2776 +    move-result-object v6
2777 +
2778 +    check-cast v6, Lcom/android/server/TelephonyRegistry$Record;
2779 +
2780 +    iget v8, v6, Lcom/android/server/TelephonyRegistry$Record;->events:I
2781 +    :try_end_2d
2782 +    .catchall {:try_start_19 .. :try_end_2d} :catchall_7f
2783 +
2784 +    and-int/lit8 v8, v8, 0x10
2785 +
2786 +    if-eqz v8, :cond_1f
2787 +
2788 +    const/4 v8, 0x0
2789 +
2790 +    :try_start_32
2791 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2792 +
2793 +    invoke-direct {p0, v8, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2794 +
2795 +    move-result v8
2796 +
2797 +    if-nez v8, :cond_90
2798 +
2799 +    if-nez v2, :cond_90
2800 +
2801 +    new-instance v5, Landroid/os/Bundle;
2802 +
2803 +    invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
2804 +
2805 +    if-eqz v4, :cond_87
2806 +
2807 +    new-instance v7, Landroid/telephony/cdma/CdmaCellLocation;
2808 +
2809 +    invoke-direct {v7}, Landroid/telephony/cdma/CdmaCellLocation;-><init>()V
2810 +
2811 +    invoke-virtual {v7, v5}, Landroid/telephony/cdma/CdmaCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2812 +
2813 +    :goto_4b
2814 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2815 +
2816 +    new-instance v10, Landroid/os/Bundle;
2817 +
2818 +    invoke-direct {v10, v5}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2819 +
2820 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2821 +
2822 +    const-string v8, "PrivacyTelephonyRegistry"
2823 +
2824 +    new-instance v10, Ljava/lang/StringBuilder;
2825 +
2826 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2827 +
2828 +    const-string v11, "package: "
2829 +
2830 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2831 +
2832 +    move-result-object v10
2833 +
2834 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2835 +
2836 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2837 +
2838 +    move-result-object v10
2839 +
2840 +    const-string v11, " blocked for CellLocation"
2841 +
2842 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2843 +
2844 +    move-result-object v10
2845 +
2846 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2847 +
2848 +    move-result-object v10
2849 +
2850 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2851 +    :try_end_75
2852 +    .catchall {:try_start_32 .. :try_end_75} :catchall_7f
2853 +    .catch Landroid/os/RemoteException; {:try_start_32 .. :try_end_75} :catch_76
2854 +
2855 +    goto :goto_1f
2856 +
2857 +    :catch_76
2858 +    move-exception v1
2859 +
2860 +    :try_start_77
2861 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2862 +
2863 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2864 +
2865 +    invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2866 +
2867 +    goto :goto_1f
2868 +
2869 +    :catchall_7f
2870 +    move-exception v8
2871 +
2872 +    monitor-exit v9
2873 +    :try_end_81
2874 +    .catchall {:try_start_77 .. :try_end_81} :catchall_7f
2875 +
2876 +    throw v8
2877 +
2878 +    :cond_82
2879 +    const/4 v4, 0x1
2880 +
2881 +    goto :goto_19
2882 +
2883 +    :catch_84
2884 +    move-exception v0
2885 +
2886 +    const/4 v2, 0x1
2887 +
2888 +    goto :goto_19
2889 +
2890 +    :cond_87
2891 +    :try_start_87
2892 +    new-instance v7, Landroid/telephony/gsm/GsmCellLocation;
2893 +
2894 +    invoke-direct {v7}, Landroid/telephony/gsm/GsmCellLocation;-><init>()V
2895 +
2896 +    invoke-virtual {v7, v5}, Landroid/telephony/gsm/GsmCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2897 +
2898 +    goto :goto_4b
2899 +
2900 +    :cond_90
2901 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2902 +
2903 +    new-instance v10, Landroid/os/Bundle;
2904 +
2905 +    invoke-direct {v10, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2906 +
2907 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2908 +
2909 +    const-string v8, "PrivacyTelephonyRegistry"
2910 +
2911 +    new-instance v10, Ljava/lang/StringBuilder;
2912 +
2913 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2914 +
2915 +    const-string v11, "package: "
2916 +
2917 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2918 +
2919 +    move-result-object v10
2920 +
2921 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2922 +
2923 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2924 +
2925 +    move-result-object v10
2926 +
2927 +    const-string v11, " allowed for CellLocation"
2928 +
2929 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2930 +
2931 +    move-result-object v10
2932 +
2933 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2934 +
2935 +    move-result-object v10
2936 +
2937 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2938 +    :try_end_ba
2939 +    .catchall {:try_start_87 .. :try_end_ba} :catchall_7f
2940 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_ba} :catch_76
2941 +
2942 +    goto/16 :goto_1f
2943 +
2944 +    :cond_bc
2945 +    :try_start_bc
2946 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2947 +
2948 +    monitor-exit v9
2949 +    :try_end_c0
2950 +    .catchall {:try_start_bc .. :try_end_c0} :catchall_7f
2951 +
2952 +    goto/16 :goto_8
2953 +.end method
2954 +
2955 +.method public bridge synthetic notifyDataActivity(I)V
2956 +    .registers 2
2957 +
2958 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyDataActivity(I)V
2959 +
2960 +    return-void
2961 +.end method
2962 +
2963 +.method public bridge synthetic notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2964 +    .registers 10
2965 +
2966 +    invoke-super/range {p0 .. p9}, Lcom/android/server/TelephonyRegistry;->notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2967 +
2968 +    return-void
2969 +.end method
2970 +
2971 +.method public bridge synthetic notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2972 +    .registers 3
2973 +
2974 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2975 +
2976 +    return-void
2977 +.end method
2978 +
2979 +.method public bridge synthetic notifyMessageWaitingChanged(Z)V
2980 +    .registers 2
2981 +
2982 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyMessageWaitingChanged(Z)V
2983 +
2984 +    return-void
2985 +.end method
2986 +
2987 +.method public bridge synthetic notifyOtaspChanged(I)V
2988 +    .registers 2
2989 +
2990 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyOtaspChanged(I)V
2991 +
2992 +    return-void
2993 +.end method
2994 +
2995 +.method public notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
2996 +    .registers 10
2997 +
2998 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2999 +
3000 +    monitor-enter v4
3001 +
3002 +    :try_start_3
3003 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3004 +
3005 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3006 +
3007 +    move-result-object v1
3008 +
3009 +    :cond_9
3010 +    :goto_9
3011 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3012 +
3013 +    move-result v3
3014 +
3015 +    if-eqz v3, :cond_35
3016 +
3017 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3018 +
3019 +    move-result-object v2
3020 +
3021 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3022 +
3023 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3024 +    :try_end_17
3025 +    .catchall {:try_start_3 .. :try_end_17} :catchall_32
3026 +
3027 +    and-int/lit8 v3, v3, 0x20
3028 +
3029 +    if-eqz v3, :cond_9
3030 +
3031 +    :try_start_1b
3032 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3033 +
3034 +    invoke-virtual {v3, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
3035 +
3036 +    move-result v3
3037 +
3038 +    if-eqz v3, :cond_9
3039 +
3040 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3041 +
3042 +    invoke-interface {v3, p1, p2}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
3043 +    :try_end_28
3044 +    .catchall {:try_start_1b .. :try_end_28} :catchall_32
3045 +    .catch Landroid/os/RemoteException; {:try_start_1b .. :try_end_28} :catch_29
3046 +
3047 +    goto :goto_9
3048 +
3049 +    :catch_29
3050 +    move-exception v0
3051 +
3052 +    :try_start_2a
3053 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3054 +
3055 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3056 +
3057 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3058 +
3059 +    goto :goto_9
3060 +
3061 +    :catchall_32
3062 +    move-exception v3
3063 +
3064 +    monitor-exit v4
3065 +    :try_end_34
3066 +    .catchall {:try_start_2a .. :try_end_34} :catchall_32
3067 +
3068 +    throw v3
3069 +
3070 +    :cond_35
3071 +    :try_start_35
3072 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3073 +
3074 +    monitor-exit v4
3075 +    :try_end_39
3076 +    .catchall {:try_start_35 .. :try_end_39} :catchall_32
3077 +
3078 +    return-void
3079 +.end method
3080 +
3081 +.method public notifyServiceState(Landroid/telephony/ServiceState;)V
3082 +    .registers 9
3083 +
3084 +    const-string v3, "notifyServiceState()"
3085 +
3086 +    invoke-virtual {p0, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
3087 +
3088 +    move-result v3
3089 +
3090 +    if-nez v3, :cond_9
3091 +
3092 +    :goto_8
3093 +    return-void
3094 +
3095 +    :cond_9
3096 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3097 +
3098 +    monitor-enter v4
3099 +
3100 +    :try_start_c
3101 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
3102 +
3103 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3104 +
3105 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3106 +
3107 +    move-result-object v1
3108 +
3109 +    :cond_14
3110 +    :goto_14
3111 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3112 +
3113 +    move-result v3
3114 +
3115 +    if-eqz v3, :cond_90
3116 +
3117 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3118 +
3119 +    move-result-object v2
3120 +
3121 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3122 +
3123 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3124 +    :try_end_22
3125 +    .catchall {:try_start_c .. :try_end_22} :catchall_6c
3126 +
3127 +    and-int/lit8 v3, v3, 0x1
3128 +
3129 +    if-eqz v3, :cond_14
3130 +
3131 +    const/4 v3, 0x4
3132 +
3133 +    :try_start_27
3134 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3135 +
3136 +    invoke-direct {p0, v3, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
3137 +
3138 +    move-result v3
3139 +
3140 +    if-nez v3, :cond_6f
3141 +
3142 +    const-string v3, ""
3143 +
3144 +    const-string v5, ""
3145 +
3146 +    const-string v6, ""
3147 +
3148 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
3149 +
3150 +    const-string v3, "PrivacyTelephonyRegistry"
3151 +
3152 +    new-instance v5, Ljava/lang/StringBuilder;
3153 +
3154 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3155 +
3156 +    const-string v6, "package: "
3157 +
3158 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3159 +
3160 +    move-result-object v5
3161 +
3162 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3163 +
3164 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3165 +
3166 +    move-result-object v5
3167 +
3168 +    const-string v6, " blocked for Cellinfo"
3169 +
3170 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3171 +
3172 +    move-result-object v5
3173 +
3174 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3175 +
3176 +    move-result-object v5
3177 +
3178 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3179 +
3180 +    :goto_58
3181 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3182 +
3183 +    new-instance v5, Landroid/telephony/ServiceState;
3184 +
3185 +    invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
3186 +
3187 +    invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
3188 +    :try_end_62
3189 +    .catchall {:try_start_27 .. :try_end_62} :catchall_6c
3190 +    .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_62} :catch_63
3191 +
3192 +    goto :goto_14
3193 +
3194 +    :catch_63
3195 +    move-exception v0
3196 +
3197 +    :try_start_64
3198 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3199 +
3200 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3201 +
3202 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3203 +
3204 +    goto :goto_14
3205 +
3206 +    :catchall_6c
3207 +    move-exception v3
3208 +
3209 +    monitor-exit v4
3210 +    :try_end_6e
3211 +    .catchall {:try_start_64 .. :try_end_6e} :catchall_6c
3212 +
3213 +    throw v3
3214 +
3215 +    :cond_6f
3216 +    :try_start_6f
3217 +    const-string v3, "PrivacyTelephonyRegistry"
3218 +
3219 +    new-instance v5, Ljava/lang/StringBuilder;
3220 +
3221 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3222 +
3223 +    const-string v6, "package: "
3224 +
3225 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3226 +
3227 +    move-result-object v5
3228 +
3229 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3230 +
3231 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3232 +
3233 +    move-result-object v5
3234 +
3235 +    const-string v6, " allowed for Cellinfo"
3236 +
3237 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3238 +
3239 +    move-result-object v5
3240 +
3241 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3242 +
3243 +    move-result-object v5
3244 +
3245 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3246 +    :try_end_8f
3247 +    .catchall {:try_start_6f .. :try_end_8f} :catchall_6c
3248 +    .catch Landroid/os/RemoteException; {:try_start_6f .. :try_end_8f} :catch_63
3249 +
3250 +    goto :goto_58
3251 +
3252 +    :cond_90
3253 +    :try_start_90
3254 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3255 +
3256 +    monitor-exit v4
3257 +    :try_end_94
3258 +    .catchall {:try_start_90 .. :try_end_94} :catchall_6c
3259 +
3260 +    invoke-virtual {p0, p1}, Lcom/android/server/PrivacyTelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
3261 +
3262 +    goto/16 :goto_8
3263 +.end method
3264 +
3265 +.method public bridge synthetic notifySignalStrength(Landroid/telephony/SignalStrength;)V
3266 +    .registers 2
3267 +
3268 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifySignalStrength(Landroid/telephony/SignalStrength;)V
3269 +
3270 +    return-void
3271 +.end method
3272 diff -Npru stock-services/smali/com/android/server/ServerThread.smali opd-services/smali/com/android/server/ServerThread.smali
3273 --- stock-services/smali/com/android/server/ServerThread.smali  2013-01-09 03:22:09.336291026 -0600
3274 +++ opd-services/smali/com/android/server/ServerThread.smali    2013-01-09 03:21:56.684228290 -0600
3275 @@ -32,6 +32,41 @@
3276      return-void
3277  .end method
3278
3279 +.method private addPrivacyService(Landroid/content/Context;)V
3280 +    .registers 5
3281 +
3282 +    :try_start_0
3283 +    const-string v1, "SystemServer"
3284 +
3285 +    const-string v2, "Privacy Service"
3286 +
3287 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3288 +
3289 +    const-string v1, "privacy"
3290 +
3291 +    new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
3292 +
3293 +    invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
3294 +
3295 +    invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3296 +    :try_end_11
3297 +    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
3298 +
3299 +    :goto_11
3300 +    return-void
3301 +
3302 +    :catch_12
3303 +    move-exception v0
3304 +
3305 +    const-string v1, "SystemServer"
3306 +
3307 +    const-string v2, "Failure starting Privacy Service"
3308 +
3309 +    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3310 +
3311 +    goto :goto_11
3312 +.end method
3313 +
3314  .method static final startSystemUi(Landroid/content/Context;)V
3315      .registers 5
3316
3317 @@ -163,7 +198,7 @@
3318
3319      const/16 v9, 0x31
3320
3321 -    if-ne v3, v9, :cond_71d
3322 +    if-ne v3, v9, :cond_722
3323
3324      const/16 v98, 0x1
3325
3326 @@ -174,7 +209,7 @@
3327
3328      const/4 v9, 0x1
3329
3330 -    if-le v3, v9, :cond_721
3331 +    if-le v3, v9, :cond_726
3332
3333      const/4 v3, 0x1
3334
3335 @@ -210,7 +245,7 @@
3336
3337      move-result v3
3338
3339 -    if-eqz v3, :cond_725
3340 +    if-eqz v3, :cond_72a
3341
3342      const/16 v69, 0x0
3343
3344 @@ -312,7 +347,7 @@
3345
3346      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3347      :try_end_c2
3348 -    .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_abf
3349 +    .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_ac4
3350
3351      :try_start_c2
3352      const-string v3, "power"
3353 @@ -337,9 +372,9 @@
3354
3355      const-string v3, "telephony.registry"
3356
3357 -    new-instance v9, Lcom/android/server/TelephonyRegistry;
3358 +    new-instance v9, Lcom/android/server/PrivacyTelephonyRegistry;
3359
3360 -    invoke-direct {v9, v4}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
3361 +    invoke-direct {v9, v4}, Lcom/android/server/PrivacyTelephonyRegistry;-><init>(Landroid/content/Context;)V
3362
3363      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3364
3365 @@ -381,7 +416,7 @@
3366
3367      move-result v3
3368
3369 -    if-eqz v3, :cond_72b
3370 +    if-eqz v3, :cond_730
3371
3372      const-string v3, "SystemServer"
3373
3374 @@ -393,7 +428,7 @@
3375
3376      :cond_119
3377      :goto_119
3378 -    if-eqz v69, :cond_740
3379 +    if-eqz v69, :cond_745
3380
3381      const/4 v3, 0x1
3382
3383 @@ -402,7 +437,7 @@
3384
3385      invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
3386      :try_end_121
3387 -    .catch Ljava/lang/RuntimeException; {:try_start_c2 .. :try_end_121} :catch_74f
3388 +    .catch Ljava/lang/RuntimeException; {:try_start_c2 .. :try_end_121} :catch_754
3389
3390      move-result-object v93
3391
3392 @@ -411,8 +446,8 @@
3393      :try_start_124
3394      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3395      :try_end_127
3396 -    .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a4e
3397 -    .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_74f
3398 +    .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a53
3399 +    .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_754
3400
3401      move-result v72
3402
3403 @@ -428,7 +463,7 @@
3404
3405      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3406      :try_end_133
3407 -    .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_74f
3408 +    .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_754
3409
3410      :try_start_133
3411      const-string v3, "SystemServer"
3412 @@ -443,8 +478,8 @@
3413
3414      invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3415      :try_end_141
3416 -    .catch Ljava/lang/Throwable; {:try_start_133 .. :try_end_141} :catch_743
3417 -    .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_74f
3418 +    .catch Ljava/lang/Throwable; {:try_start_133 .. :try_end_141} :catch_748
3419 +    .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_754
3420
3421      :try_start_141
3422      const-string v3, "account"
3423 @@ -453,8 +488,8 @@
3424
3425      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3426      :try_end_148
3427 -    .catch Ljava/lang/Throwable; {:try_start_141 .. :try_end_148} :catch_afe
3428 -    .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_ac8
3429 +    .catch Ljava/lang/Throwable; {:try_start_141 .. :try_end_148} :catch_b03
3430 +    .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_acd
3431
3432      move-object/from16 v42, v43
3433
3434 @@ -470,7 +505,7 @@
3435
3436      move/from16 v0, v69
3437
3438 -    if-ne v0, v3, :cond_766
3439 +    if-ne v0, v3, :cond_76b
3440
3441      const/4 v3, 0x1
3442
3443 @@ -479,6 +514,10 @@
3444
3445      move-result-object v58
3446
3447 +    move-object/from16 v0, p0
3448 +
3449 +    invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
3450 +
3451      const-string v3, "SystemServer"
3452
3453      const-string v9, "System Content Providers"
3454 @@ -498,10 +537,10 @@
3455      move-object/from16 v0, v78
3456
3457      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3458 -    :try_end_173
3459 -    .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_173} :catch_74f
3460 +    :try_end_178
3461 +    .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_178} :catch_754
3462
3463 -    :try_start_173
3464 +    :try_start_178
3465      const-string v3, "SystemServer"
3466
3467      const-string v9, "Battery Service"
3468 @@ -513,10 +552,10 @@
3469      move-object/from16 v0, v78
3470
3471      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3472 -    :try_end_181
3473 -    .catch Ljava/lang/RuntimeException; {:try_start_173 .. :try_end_181} :catch_ad1
3474 +    :try_end_186
3475 +    .catch Ljava/lang/RuntimeException; {:try_start_178 .. :try_end_186} :catch_ad6
3476
3477 -    :try_start_181
3478 +    :try_start_186
3479      const-string v3, "battery"
3480
3481      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3482 @@ -532,10 +571,10 @@
3483      move-object/from16 v0, v118
3484
3485      invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3486 -    :try_end_194
3487 -    .catch Ljava/lang/RuntimeException; {:try_start_181 .. :try_end_194} :catch_ada
3488 +    :try_end_199
3489 +    .catch Ljava/lang/RuntimeException; {:try_start_186 .. :try_end_199} :catch_adf
3490
3491 -    :try_start_194
3492 +    :try_start_199
3493      const-string v3, "vibrator"
3494
3495      move-object/from16 v0, v118
3496 @@ -559,10 +598,10 @@
3497      new-instance v7, Lcom/android/server/AlarmManagerService;
3498
3499      invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
3500 -    :try_end_1b0
3501 -    .catch Ljava/lang/RuntimeException; {:try_start_194 .. :try_end_1b0} :catch_ae1
3502 +    :try_end_1b5
3503 +    .catch Ljava/lang/RuntimeException; {:try_start_199 .. :try_end_1b5} :catch_ae6
3504
3505 -    :try_start_1b0
3506 +    :try_start_1b5
3507      const-string v3, "alarm"
3508
3509      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3510 @@ -593,18 +632,18 @@
3511
3512      move/from16 v0, v69
3513
3514 -    if-eq v0, v3, :cond_769
3515 +    if-eq v0, v3, :cond_76e
3516
3517      const/4 v3, 0x1
3518
3519      move v9, v3
3520
3521 -    :goto_1d5
3522 -    if-nez v72, :cond_76d
3523 +    :goto_1da
3524 +    if-nez v72, :cond_772
3525
3526      const/4 v3, 0x1
3527
3528 -    :goto_1d8
3529 +    :goto_1dd
3530      move/from16 v0, v92
3531
3532      invoke-static {v4, v6, v9, v3, v0}, Lcom/android/server/wm/WindowManagerService;->main(Landroid/content/Context;Lcom/android/server/PowerManagerService;ZZZ)Lcom/android/server/wm/WindowManagerService;
3533 @@ -647,22 +686,22 @@
3534
3535      move-result v3
3536
3537 -    if-eqz v3, :cond_770
3538 +    if-eqz v3, :cond_775
3539
3540      const-string v3, "SystemServer"
3541
3542      const-string v9, "No Bluetooh Service (emulator)"
3543
3544      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3545 -    :try_end_20e
3546 -    .catch Ljava/lang/RuntimeException; {:try_start_1b0 .. :try_end_20e} :catch_77e
3547 +    :try_end_213
3548 +    .catch Ljava/lang/RuntimeException; {:try_start_1b5 .. :try_end_213} :catch_783
3549
3550 -    :goto_20e
3551 +    :goto_213
3552      move-object/from16 v117, v118
3553
3554      move-object/from16 v77, v78
3555
3556 -    :goto_212
3557 +    :goto_217
3558      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
3559
3560      move-result-object v3
3561 @@ -701,9 +740,9 @@
3562
3563      move/from16 v0, v69
3564
3565 -    if-eq v0, v3, :cond_264
3566 +    if-eq v0, v3, :cond_269
3567
3568 -    :try_start_23a
3569 +    :try_start_23f
3570      const-string v3, "SystemServer"
3571
3572      const-string v9, "Input Method Service"
3573 @@ -717,22 +756,22 @@
3574      move-object/from16 v1, v126
3575
3576      invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3577 -    :try_end_24a
3578 -    .catch Ljava/lang/Throwable; {:try_start_23a .. :try_end_24a} :catch_7d3
3579 +    :try_end_24f
3580 +    .catch Ljava/lang/Throwable; {:try_start_23f .. :try_end_24f} :catch_7d8
3581
3582 -    :try_start_24a
3583 +    :try_start_24f
3584      const-string v3, "input_method"
3585
3586      move-object/from16 v0, v75
3587
3588      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3589 -    :try_end_251
3590 -    .catch Ljava/lang/Throwable; {:try_start_24a .. :try_end_251} :catch_aba
3591 +    :try_end_256
3592 +    .catch Ljava/lang/Throwable; {:try_start_24f .. :try_end_256} :catch_abf
3593
3594      move-object/from16 v74, v75
3595
3596 -    :goto_253
3597 -    :try_start_253
3598 +    :goto_258
3599 +    :try_start_258
3600      const-string v3, "SystemServer"
3601
3602      const-string v9, "Accessibility Manager"
3603 @@ -746,24 +785,24 @@
3604      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
3605
3606      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3607 -    :try_end_264
3608 -    .catch Ljava/lang/Throwable; {:try_start_253 .. :try_end_264} :catch_7df
3609 +    :try_end_269
3610 +    .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_269} :catch_7e4
3611
3612 -    :cond_264
3613 -    :goto_264
3614 -    :try_start_264
3615 +    :cond_269
3616 +    :goto_269
3617 +    :try_start_269
3618      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3619 -    :try_end_267
3620 -    .catch Ljava/lang/Throwable; {:try_start_264 .. :try_end_267} :catch_7eb
3621 +    :try_end_26c
3622 +    .catch Ljava/lang/Throwable; {:try_start_269 .. :try_end_26c} :catch_7f0
3623
3624 -    :goto_267
3625 -    :try_start_267
3626 +    :goto_26c
3627 +    :try_start_26c
3628      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3629 -    :try_end_26a
3630 -    .catch Ljava/lang/Throwable; {:try_start_267 .. :try_end_26a} :catch_7f7
3631 +    :try_end_26f
3632 +    .catch Ljava/lang/Throwable; {:try_start_26c .. :try_end_26f} :catch_7fc
3633
3634 -    :goto_26a
3635 -    :try_start_26a
3636 +    :goto_26f
3637 +    :try_start_26f
3638      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3639
3640      move-result-object v3
3641 @@ -781,15 +820,15 @@
3642      const/4 v10, 0x0
3643
3644      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3645 -    :try_end_27d
3646 -    .catch Landroid/os/RemoteException; {:try_start_26a .. :try_end_27d} :catch_ab7
3647 +    :try_end_282
3648 +    .catch Landroid/os/RemoteException; {:try_start_26f .. :try_end_282} :catch_abc
3649
3650 -    :goto_27d
3651 +    :goto_282
3652      const/4 v3, 0x1
3653
3654      move/from16 v0, v69
3655
3656 -    if-eq v0, v3, :cond_b03
3657 +    if-eq v0, v3, :cond_b08
3658
3659      const/16 v84, 0x0
3660
3661 @@ -805,9 +844,9 @@
3662
3663      move-result v3
3664
3665 -    if-nez v3, :cond_2a9
3666 +    if-nez v3, :cond_2ae
3667
3668 -    :try_start_292
3669 +    :try_start_297
3670      const-string v3, "SystemServer"
3671
3672      const-string v9, "Mount Service"
3673 @@ -819,23 +858,23 @@
3674      move-object/from16 v0, v85
3675
3676      invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3677 -    :try_end_2a0
3678 -    .catch Ljava/lang/Throwable; {:try_start_292 .. :try_end_2a0} :catch_803
3679 +    :try_end_2a5
3680 +    .catch Ljava/lang/Throwable; {:try_start_297 .. :try_end_2a5} :catch_808
3681
3682 -    :try_start_2a0
3683 +    :try_start_2a5
3684      const-string v3, "mount"
3685
3686      move-object/from16 v0, v85
3687
3688      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3689 -    :try_end_2a7
3690 -    .catch Ljava/lang/Throwable; {:try_start_2a0 .. :try_end_2a7} :catch_ab2
3691 +    :try_end_2ac
3692 +    .catch Ljava/lang/Throwable; {:try_start_2a5 .. :try_end_2ac} :catch_ab7
3693
3694      move-object/from16 v84, v85
3695
3696 -    :cond_2a9
3697 -    :goto_2a9
3698 -    :try_start_2a9
3699 +    :cond_2ae
3700 +    :goto_2ae
3701 +    :try_start_2ae
3702      const-string v3, "SystemServer"
3703
3704      const-string v9, "LockSettingsService"
3705 @@ -847,22 +886,22 @@
3706      move-object/from16 v0, v82
3707
3708      invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3709 -    :try_end_2b7
3710 -    .catch Ljava/lang/Throwable; {:try_start_2a9 .. :try_end_2b7} :catch_80f
3711 +    :try_end_2bc
3712 +    .catch Ljava/lang/Throwable; {:try_start_2ae .. :try_end_2bc} :catch_814
3713
3714 -    :try_start_2b7
3715 +    :try_start_2bc
3716      const-string v3, "lock_settings"
3717
3718      move-object/from16 v0, v82
3719
3720      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3721 -    :try_end_2be
3722 -    .catch Ljava/lang/Throwable; {:try_start_2b7 .. :try_end_2be} :catch_aad
3723 +    :try_end_2c3
3724 +    .catch Ljava/lang/Throwable; {:try_start_2bc .. :try_end_2c3} :catch_ab2
3725
3726      move-object/from16 v81, v82
3727
3728 -    :goto_2c0
3729 -    :try_start_2c0
3730 +    :goto_2c5
3731 +    :try_start_2c5
3732      const-string v3, "SystemServer"
3733
3734      const-string v9, "Device Policy"
3735 @@ -874,22 +913,22 @@
3736      move-object/from16 v0, v63
3737
3738      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3739 -    :try_end_2ce
3740 -    .catch Ljava/lang/Throwable; {:try_start_2c0 .. :try_end_2ce} :catch_81b
3741 +    :try_end_2d3
3742 +    .catch Ljava/lang/Throwable; {:try_start_2c5 .. :try_end_2d3} :catch_820
3743
3744 -    :try_start_2ce
3745 +    :try_start_2d3
3746      const-string v3, "device_policy"
3747
3748      move-object/from16 v0, v63
3749
3750      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3751 -    :try_end_2d5
3752 -    .catch Ljava/lang/Throwable; {:try_start_2ce .. :try_end_2d5} :catch_aa8
3753 +    :try_end_2da
3754 +    .catch Ljava/lang/Throwable; {:try_start_2d3 .. :try_end_2da} :catch_aad
3755
3756      move-object/from16 v62, v63
3757
3758 -    :goto_2d7
3759 -    :try_start_2d7
3760 +    :goto_2dc
3761 +    :try_start_2dc
3762      const-string v3, "SystemServer"
3763
3764      const-string v9, "Status Bar"
3765 @@ -903,22 +942,22 @@
3766      move-object/from16 v1, v126
3767
3768      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3769 -    :try_end_2e7
3770 -    .catch Ljava/lang/Throwable; {:try_start_2d7 .. :try_end_2e7} :catch_827
3771 +    :try_end_2ec
3772 +    .catch Ljava/lang/Throwable; {:try_start_2dc .. :try_end_2ec} :catch_82c
3773
3774 -    :try_start_2e7
3775 +    :try_start_2ec
3776      const-string v3, "statusbar"
3777
3778      move-object/from16 v0, v108
3779
3780      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3781 -    :try_end_2ee
3782 -    .catch Ljava/lang/Throwable; {:try_start_2e7 .. :try_end_2ee} :catch_aa3
3783 +    :try_end_2f3
3784 +    .catch Ljava/lang/Throwable; {:try_start_2ec .. :try_end_2f3} :catch_aa8
3785
3786      move-object/from16 v107, v108
3787
3788 -    :goto_2f0
3789 -    :try_start_2f0
3790 +    :goto_2f5
3791 +    :try_start_2f5
3792      const-string v3, "SystemServer"
3793
3794      const-string v9, "Clipboard Service"
3795 @@ -932,11 +971,11 @@
3796      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
3797
3798      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3799 -    :try_end_301
3800 -    .catch Ljava/lang/Throwable; {:try_start_2f0 .. :try_end_301} :catch_833
3801 +    :try_end_306
3802 +    .catch Ljava/lang/Throwable; {:try_start_2f5 .. :try_end_306} :catch_838
3803
3804 -    :goto_301
3805 -    :try_start_301
3806 +    :goto_306
3807 +    :try_start_306
3808      const-string v3, "SystemServer"
3809
3810      const-string v9, "NetworkManagement Service"
3811 @@ -950,11 +989,11 @@
3812      const-string v3, "network_management"
3813
3814      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3815 -    :try_end_311
3816 -    .catch Ljava/lang/Throwable; {:try_start_301 .. :try_end_311} :catch_83f
3817 +    :try_end_316
3818 +    .catch Ljava/lang/Throwable; {:try_start_306 .. :try_end_316} :catch_844
3819
3820 -    :goto_311
3821 -    :try_start_311
3822 +    :goto_316
3823 +    :try_start_316
3824      const-string v3, "SystemServer"
3825
3826      const-string v9, "Text Service Manager Service"
3827 @@ -966,22 +1005,22 @@
3828      move-object/from16 v0, v112
3829
3830      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3831 -    :try_end_31f
3832 -    .catch Ljava/lang/Throwable; {:try_start_311 .. :try_end_31f} :catch_84b
3833 +    :try_end_324
3834 +    .catch Ljava/lang/Throwable; {:try_start_316 .. :try_end_324} :catch_850
3835
3836 -    :try_start_31f
3837 +    :try_start_324
3838      const-string v3, "textservices"
3839
3840      move-object/from16 v0, v112
3841
3842      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3843 -    :try_end_326
3844 -    .catch Ljava/lang/Throwable; {:try_start_31f .. :try_end_326} :catch_a9e
3845 +    :try_end_32b
3846 +    .catch Ljava/lang/Throwable; {:try_start_324 .. :try_end_32b} :catch_aa3
3847
3848      move-object/from16 v111, v112
3849
3850 -    :goto_328
3851 -    :try_start_328
3852 +    :goto_32d
3853 +    :try_start_32d
3854      const-string v3, "SystemServer"
3855
3856      const-string v9, "NetworkStats Service"
3857 @@ -993,22 +1032,22 @@
3858      move-object/from16 v0, v87
3859
3860      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
3861 -    :try_end_336
3862 -    .catch Ljava/lang/Throwable; {:try_start_328 .. :try_end_336} :catch_857
3863 +    :try_end_33b
3864 +    .catch Ljava/lang/Throwable; {:try_start_32d .. :try_end_33b} :catch_85c
3865
3866 -    :try_start_336
3867 +    :try_start_33b
3868      const-string v3, "netstats"
3869
3870      move-object/from16 v0, v87
3871
3872      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3873 -    :try_end_33d
3874 -    .catch Ljava/lang/Throwable; {:try_start_336 .. :try_end_33d} :catch_a99
3875 +    :try_end_342
3876 +    .catch Ljava/lang/Throwable; {:try_start_33b .. :try_end_342} :catch_a9e
3877
3878      move-object/from16 v12, v87
3879
3880 -    :goto_33f
3881 -    :try_start_33f
3882 +    :goto_344
3883 +    :try_start_344
3884      const-string v3, "SystemServer"
3885
3886      const-string v9, "NetworkPolicy Service"
3887 @@ -1026,18 +1065,18 @@
3888      move-object v11, v6
3889
3890      invoke-direct/range {v8 .. v13}, Lcom/android/server/net/NetworkPolicyManagerService;-><init>(Landroid/content/Context;Landroid/app/IActivityManager;Landroid/os/IPowerManager;Landroid/net/INetworkStatsService;Landroid/os/INetworkManagementService;)V
3891 -    :try_end_351
3892 -    .catch Ljava/lang/Throwable; {:try_start_33f .. :try_end_351} :catch_863
3893 +    :try_end_356
3894 +    .catch Ljava/lang/Throwable; {:try_start_344 .. :try_end_356} :catch_868
3895
3896 -    :try_start_351
3897 +    :try_start_356
3898      const-string v3, "netpolicy"
3899
3900      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3901 -    :try_end_356
3902 -    .catch Ljava/lang/Throwable; {:try_start_351 .. :try_end_356} :catch_a96
3903 +    :try_end_35b
3904 +    .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_35b} :catch_a9b
3905
3906 -    :goto_356
3907 -    :try_start_356
3908 +    :goto_35b
3909 +    :try_start_35b
3910      const-string v3, "SystemServer"
3911
3912      const-string v9, "Wi-Fi P2pService"
3913 @@ -1049,22 +1088,22 @@
3914      move-object/from16 v0, v125
3915
3916      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3917 -    :try_end_364
3918 -    .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_364} :catch_871
3919 +    :try_end_369
3920 +    .catch Ljava/lang/Throwable; {:try_start_35b .. :try_end_369} :catch_876
3921
3922 -    :try_start_364
3923 +    :try_start_369
3924      const-string v3, "wifip2p"
3925
3926      move-object/from16 v0, v125
3927
3928      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3929 -    :try_end_36b
3930 -    .catch Ljava/lang/Throwable; {:try_start_364 .. :try_end_36b} :catch_a91
3931 +    :try_end_370
3932 +    .catch Ljava/lang/Throwable; {:try_start_369 .. :try_end_370} :catch_a96
3933
3934      move-object/from16 v124, v125
3935
3936 -    :goto_36d
3937 -    :try_start_36d
3938 +    :goto_372
3939 +    :try_start_372
3940      const-string v3, "SystemServer"
3941
3942      const-string v9, "Wi-Fi Service"
3943 @@ -1076,22 +1115,22 @@
3944      move-object/from16 v0, v123
3945
3946      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3947 -    :try_end_37b
3948 -    .catch Ljava/lang/Throwable; {:try_start_36d .. :try_end_37b} :catch_87d
3949 +    :try_end_380
3950 +    .catch Ljava/lang/Throwable; {:try_start_372 .. :try_end_380} :catch_882
3951
3952 -    :try_start_37b
3953 +    :try_start_380
3954      const-string v3, "wifi"
3955
3956      move-object/from16 v0, v123
3957
3958      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3959 -    :try_end_382
3960 -    .catch Ljava/lang/Throwable; {:try_start_37b .. :try_end_382} :catch_a8c
3961 +    :try_end_387
3962 +    .catch Ljava/lang/Throwable; {:try_start_380 .. :try_end_387} :catch_a91
3963
3964      move-object/from16 v122, v123
3965
3966 -    :goto_384
3967 -    :try_start_384
3968 +    :goto_389
3969 +    :try_start_389
3970      const-string v3, "SystemServer"
3971
3972      const-string v9, "Connectivity Service"
3973 @@ -1103,10 +1142,10 @@
3974      move-object/from16 v0, v57
3975
3976      invoke-direct {v0, v4, v13, v12, v8}, Lcom/android/server/ConnectivityService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/net/INetworkStatsService;Landroid/net/INetworkPolicyManager;)V
3977 -    :try_end_392
3978 -    .catch Ljava/lang/Throwable; {:try_start_384 .. :try_end_392} :catch_889
3979 +    :try_end_397
3980 +    .catch Ljava/lang/Throwable; {:try_start_389 .. :try_end_397} :catch_88e
3981
3982 -    :try_start_392
3983 +    :try_start_397
3984      const-string v3, "connectivity"
3985
3986      move-object/from16 v0, v57
3987 @@ -1124,13 +1163,13 @@
3988      invoke-virtual/range {v122 .. v122}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3989
3990      invoke-virtual/range {v124 .. v124}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3991 -    :try_end_3a9
3992 -    .catch Ljava/lang/Throwable; {:try_start_392 .. :try_end_3a9} :catch_a87
3993 +    :try_end_3ae
3994 +    .catch Ljava/lang/Throwable; {:try_start_397 .. :try_end_3ae} :catch_a8c
3995
3996      move-object/from16 v56, v57
3997
3998 -    :goto_3ab
3999 -    :try_start_3ab
4000 +    :goto_3b0
4001 +    :try_start_3b0
4002      const-string v3, "SystemServer"
4003
4004      const-string v9, "Network Service Discovery Service"
4005 @@ -1146,11 +1185,11 @@
4006      move-object/from16 v0, v105
4007
4008      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4009 -    :try_end_3bd
4010 -    .catch Ljava/lang/Throwable; {:try_start_3ab .. :try_end_3bd} :catch_895
4011 +    :try_end_3c2
4012 +    .catch Ljava/lang/Throwable; {:try_start_3b0 .. :try_end_3c2} :catch_89a
4013
4014 -    :goto_3bd
4015 -    :try_start_3bd
4016 +    :goto_3c2
4017 +    :try_start_3c2
4018      const-string v3, "SystemServer"
4019
4020      const-string v9, "Throttle Service"
4021 @@ -1162,22 +1201,22 @@
4022      move-object/from16 v0, v110
4023
4024      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4025 -    :try_end_3cb
4026 -    .catch Ljava/lang/Throwable; {:try_start_3bd .. :try_end_3cb} :catch_8a1
4027 +    :try_end_3d0
4028 +    .catch Ljava/lang/Throwable; {:try_start_3c2 .. :try_end_3d0} :catch_8a6
4029
4030 -    :try_start_3cb
4031 +    :try_start_3d0
4032      const-string v3, "throttle"
4033
4034      move-object/from16 v0, v110
4035
4036      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4037 -    :try_end_3d2
4038 -    .catch Ljava/lang/Throwable; {:try_start_3cb .. :try_end_3d2} :catch_a82
4039 +    :try_end_3d7
4040 +    .catch Ljava/lang/Throwable; {:try_start_3d0 .. :try_end_3d7} :catch_a87
4041
4042      move-object/from16 v109, v110
4043
4044 -    :goto_3d4
4045 -    :try_start_3d4
4046 +    :goto_3d9
4047 +    :try_start_3d9
4048      const-string v3, "SystemServer"
4049
4050      const-string v9, "UpdateLock Service"
4051 @@ -1191,16 +1230,16 @@
4052      invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
4053
4054      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4055 -    :try_end_3e5
4056 -    .catch Ljava/lang/Throwable; {:try_start_3d4 .. :try_end_3e5} :catch_8ad
4057 +    :try_end_3ea
4058 +    .catch Ljava/lang/Throwable; {:try_start_3d9 .. :try_end_3ea} :catch_8b2
4059
4060 -    :goto_3e5
4061 -    if-eqz v84, :cond_3ea
4062 +    :goto_3ea
4063 +    if-eqz v84, :cond_3ef
4064
4065      invoke-virtual/range {v84 .. v84}, Lcom/android/server/MountService;->waitForAsecScan()V
4066
4067 -    :cond_3ea
4068 -    :try_start_3ea
4069 +    :cond_3ef
4070 +    :try_start_3ef
4071      const-string v3, "SystemServer"
4072
4073      const-string v9, "Profile Manager"
4074 @@ -1212,40 +1251,40 @@
4075      move-object/from16 v0, v96
4076
4077      invoke-direct {v0, v4}, Lcom/android/server/ProfileManagerService;-><init>(Landroid/content/Context;)V
4078 -    :try_end_3f8
4079 -    .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3f8} :catch_8b9
4080 +    :try_end_3fd
4081 +    .catch Ljava/lang/Throwable; {:try_start_3ef .. :try_end_3fd} :catch_8be
4082
4083 -    :try_start_3f8
4084 +    :try_start_3fd
4085      const-string v3, "profile"
4086
4087      move-object/from16 v0, v96
4088
4089      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4090 -    :try_end_3ff
4091 -    .catch Ljava/lang/Throwable; {:try_start_3f8 .. :try_end_3ff} :catch_a7d
4092 +    :try_end_404
4093 +    .catch Ljava/lang/Throwable; {:try_start_3fd .. :try_end_404} :catch_a82
4094
4095      move-object/from16 v95, v96
4096
4097 -    :goto_401
4098 -    if-eqz v42, :cond_406
4099 -
4100 -    :try_start_403
4101 -    invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
4102 -    :try_end_406
4103 -    .catch Ljava/lang/Throwable; {:try_start_403 .. :try_end_406} :catch_8c5
4104 -
4105 -    :cond_406
4106      :goto_406
4107 -    if-eqz v58, :cond_40b
4108 +    if-eqz v42, :cond_40b
4109
4110      :try_start_408
4111 -    invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
4112 +    invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
4113      :try_end_40b
4114 -    .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8d1
4115 +    .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8ca
4116
4117      :cond_40b
4118      :goto_40b
4119 -    :try_start_40b
4120 +    if-eqz v58, :cond_410
4121 +
4122 +    :try_start_40d
4123 +    invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
4124 +    :try_end_410
4125 +    .catch Ljava/lang/Throwable; {:try_start_40d .. :try_end_410} :catch_8d6
4126 +
4127 +    :cond_410
4128 +    :goto_410
4129 +    :try_start_410
4130      const-string v3, "SystemServer"
4131
4132      const-string v9, "Notification Manager"
4133 @@ -1261,10 +1300,10 @@
4134      move-object/from16 v2, v77
4135
4136      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4137 -    :try_end_41d
4138 -    .catch Ljava/lang/Throwable; {:try_start_40b .. :try_end_41d} :catch_8dd
4139 +    :try_end_422
4140 +    .catch Ljava/lang/Throwable; {:try_start_410 .. :try_end_422} :catch_8e2
4141
4142 -    :try_start_41d
4143 +    :try_start_422
4144      const-string v3, "notification"
4145
4146      move-object/from16 v0, v91
4147 @@ -1274,13 +1313,13 @@
4148      move-object/from16 v0, v91
4149
4150      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4151 -    :try_end_429
4152 -    .catch Ljava/lang/Throwable; {:try_start_41d .. :try_end_429} :catch_a78
4153 +    :try_end_42e
4154 +    .catch Ljava/lang/Throwable; {:try_start_422 .. :try_end_42e} :catch_a7d
4155
4156      move-object/from16 v90, v91
4157
4158 -    :goto_42b
4159 -    :try_start_42b
4160 +    :goto_430
4161 +    :try_start_430
4162      const-string v3, "SystemServer"
4163
4164      const-string v9, "Device Storage Monitor"
4165 @@ -1294,11 +1333,11 @@
4166      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4167
4168      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4169 -    :try_end_43c
4170 -    .catch Ljava/lang/Throwable; {:try_start_42b .. :try_end_43c} :catch_8e9
4171 +    :try_end_441
4172 +    .catch Ljava/lang/Throwable; {:try_start_430 .. :try_end_441} :catch_8ee
4173
4174 -    :goto_43c
4175 -    :try_start_43c
4176 +    :goto_441
4177 +    :try_start_441
4178      const-string v3, "SystemServer"
4179
4180      const-string v9, "Location Manager"
4181 @@ -1310,22 +1349,22 @@
4182      move-object/from16 v0, v80
4183
4184      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4185 -    :try_end_44a
4186 -    .catch Ljava/lang/Throwable; {:try_start_43c .. :try_end_44a} :catch_8f5
4187 +    :try_end_44f
4188 +    .catch Ljava/lang/Throwable; {:try_start_441 .. :try_end_44f} :catch_8fa
4189
4190 -    :try_start_44a
4191 +    :try_start_44f
4192      const-string v3, "location"
4193
4194      move-object/from16 v0, v80
4195
4196      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4197 -    :try_end_451
4198 -    .catch Ljava/lang/Throwable; {:try_start_44a .. :try_end_451} :catch_a73
4199 +    :try_end_456
4200 +    .catch Ljava/lang/Throwable; {:try_start_44f .. :try_end_456} :catch_a78
4201
4202      move-object/from16 v79, v80
4203
4204 -    :goto_453
4205 -    :try_start_453
4206 +    :goto_458
4207 +    :try_start_458
4208      const-string v3, "SystemServer"
4209
4210      const-string v9, "Country Detector"
4211 @@ -1337,22 +1376,22 @@
4212      move-object/from16 v0, v60
4213
4214      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4215 -    :try_end_461
4216 -    .catch Ljava/lang/Throwable; {:try_start_453 .. :try_end_461} :catch_901
4217 +    :try_end_466
4218 +    .catch Ljava/lang/Throwable; {:try_start_458 .. :try_end_466} :catch_906
4219
4220 -    :try_start_461
4221 +    :try_start_466
4222      const-string v3, "country_detector"
4223
4224      move-object/from16 v0, v60
4225
4226      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4227 -    :try_end_468
4228 -    .catch Ljava/lang/Throwable; {:try_start_461 .. :try_end_468} :catch_a6e
4229 +    :try_end_46d
4230 +    .catch Ljava/lang/Throwable; {:try_start_466 .. :try_end_46d} :catch_a73
4231
4232      move-object/from16 v59, v60
4233
4234 -    :goto_46a
4235 -    :try_start_46a
4236 +    :goto_46f
4237 +    :try_start_46f
4238      const-string v3, "SystemServer"
4239
4240      const-string v9, "Search Service"
4241 @@ -1366,11 +1405,11 @@
4242      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4243
4244      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4245 -    :try_end_47b
4246 -    .catch Ljava/lang/Throwable; {:try_start_46a .. :try_end_47b} :catch_90d
4247 +    :try_end_480
4248 +    .catch Ljava/lang/Throwable; {:try_start_46f .. :try_end_480} :catch_912
4249
4250 -    :goto_47b
4251 -    :try_start_47b
4252 +    :goto_480
4253 +    :try_start_480
4254      const-string v3, "SystemServer"
4255
4256      const-string v9, "DropBox Service"
4257 @@ -1390,10 +1429,10 @@
4258      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4259
4260      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4261 -    :try_end_493
4262 -    .catch Ljava/lang/Throwable; {:try_start_47b .. :try_end_493} :catch_919
4263 +    :try_end_498
4264 +    .catch Ljava/lang/Throwable; {:try_start_480 .. :try_end_498} :catch_91e
4265
4266 -    :goto_493
4267 +    :goto_498
4268      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4269
4270      move-result-object v3
4271 @@ -1404,38 +1443,38 @@
4272
4273      move-result v3
4274
4275 -    if-eqz v3, :cond_4b9
4276 +    if-eqz v3, :cond_4be
4277
4278 -    :try_start_4a0
4279 +    :try_start_4a5
4280      const-string v3, "SystemServer"
4281
4282      const-string v9, "Wallpaper Service"
4283
4284      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4285
4286 -    if-nez v16, :cond_4b9
4287 +    if-nez v16, :cond_4be
4288
4289      new-instance v121, Lcom/android/server/WallpaperManagerService;
4290
4291      move-object/from16 v0, v121
4292
4293      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4294 -    :try_end_4b0
4295 -    .catch Ljava/lang/Throwable; {:try_start_4a0 .. :try_end_4b0} :catch_925
4296 +    :try_end_4b5
4297 +    .catch Ljava/lang/Throwable; {:try_start_4a5 .. :try_end_4b5} :catch_92a
4298
4299 -    :try_start_4b0
4300 +    :try_start_4b5
4301      const-string v3, "wallpaper"
4302
4303      move-object/from16 v0, v121
4304
4305      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4306 -    :try_end_4b7
4307 -    .catch Ljava/lang/Throwable; {:try_start_4b0 .. :try_end_4b7} :catch_a69
4308 +    :try_end_4bc
4309 +    .catch Ljava/lang/Throwable; {:try_start_4b5 .. :try_end_4bc} :catch_a6e
4310
4311      move-object/from16 v120, v121
4312
4313 -    :cond_4b9
4314 -    :goto_4b9
4315 +    :cond_4be
4316 +    :goto_4be
4317      const-string v3, "0"
4318
4319      const-string v9, "system_init.startaudioservice"
4320 @@ -1448,9 +1487,9 @@
4321
4322      move-result v3
4323
4324 -    if-nez v3, :cond_4d8
4325 +    if-nez v3, :cond_4dd
4326
4327 -    :try_start_4c7
4328 +    :try_start_4cc
4329      const-string v3, "SystemServer"
4330
4331      const-string v9, "Audio Service"
4332 @@ -1464,12 +1503,12 @@
4333      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4334
4335      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4336 -    :try_end_4d8
4337 -    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d8} :catch_931
4338 +    :try_end_4dd
4339 +    .catch Ljava/lang/Throwable; {:try_start_4cc .. :try_end_4dd} :catch_936
4340
4341 -    :cond_4d8
4342 -    :goto_4d8
4343 -    :try_start_4d8
4344 +    :cond_4dd
4345 +    :goto_4dd
4346 +    :try_start_4dd
4347      const-string v3, "SystemServer"
4348
4349      const-string v9, "Dock Observer"
4350 @@ -1481,15 +1520,15 @@
4351      move-object/from16 v0, v65
4352
4353      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4354 -    :try_end_4e6
4355 -    .catch Ljava/lang/Throwable; {:try_start_4d8 .. :try_end_4e6} :catch_93d
4356 +    :try_end_4eb
4357 +    .catch Ljava/lang/Throwable; {:try_start_4dd .. :try_end_4eb} :catch_942
4358
4359      move-object/from16 v64, v65
4360
4361 -    :goto_4e8
4362 -    if-eqz v73, :cond_4fa
4363 +    :goto_4ed
4364 +    if-eqz v73, :cond_4ff
4365
4366 -    :try_start_4ea
4367 +    :try_start_4ef
4368      const-string v3, "SystemServer"
4369
4370      const-string v9, "Rotation Switch Observer"
4371 @@ -1501,14 +1540,14 @@
4372      move-object/from16 v0, v102
4373
4374      invoke-direct {v0, v4}, Lcom/android/server/RotationSwitchObserver;-><init>(Landroid/content/Context;)V
4375 -    :try_end_4f8
4376 -    .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_949
4377 +    :try_end_4fd
4378 +    .catch Ljava/lang/Throwable; {:try_start_4ef .. :try_end_4fd} :catch_94e
4379
4380      move-object/from16 v101, v102
4381
4382 -    :cond_4fa
4383 -    :goto_4fa
4384 -    :try_start_4fa
4385 +    :cond_4ff
4386 +    :goto_4ff
4387 +    :try_start_4ff
4388      const-string v3, "SystemServer"
4389
4390      const-string v9, "Wired Accessory Observer"
4391 @@ -1518,11 +1557,11 @@
4392      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4393
4394      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4395 -    :try_end_506
4396 -    .catch Ljava/lang/Throwable; {:try_start_4fa .. :try_end_506} :catch_955
4397 +    :try_end_50b
4398 +    .catch Ljava/lang/Throwable; {:try_start_4ff .. :try_end_50b} :catch_95a
4399
4400 -    :goto_506
4401 -    :try_start_506
4402 +    :goto_50b
4403 +    :try_start_50b
4404      const-string v3, "SystemServer"
4405
4406      const-string v9, "USB Service"
4407 @@ -1534,22 +1573,22 @@
4408      move-object/from16 v0, v116
4409
4410      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4411 -    :try_end_514
4412 -    .catch Ljava/lang/Throwable; {:try_start_506 .. :try_end_514} :catch_961
4413 +    :try_end_519
4414 +    .catch Ljava/lang/Throwable; {:try_start_50b .. :try_end_519} :catch_966
4415
4416 -    :try_start_514
4417 +    :try_start_519
4418      const-string v3, "usb"
4419
4420      move-object/from16 v0, v116
4421
4422      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4423 -    :try_end_51b
4424 -    .catch Ljava/lang/Throwable; {:try_start_514 .. :try_end_51b} :catch_a64
4425 +    :try_end_520
4426 +    .catch Ljava/lang/Throwable; {:try_start_519 .. :try_end_520} :catch_a69
4427
4428      move-object/from16 v115, v116
4429
4430 -    :goto_51d
4431 -    :try_start_51d
4432 +    :goto_522
4433 +    :try_start_522
4434      const-string v3, "SystemServer"
4435
4436      const-string v9, "Serial Service"
4437 @@ -1561,22 +1600,22 @@
4438      move-object/from16 v0, v104
4439
4440      invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4441 -    :try_end_52b
4442 -    .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_96d
4443 +    :try_end_530
4444 +    .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_972
4445
4446 -    :try_start_52b
4447 +    :try_start_530
4448      const-string v3, "serial"
4449
4450      move-object/from16 v0, v104
4451
4452      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4453 -    :try_end_532
4454 -    .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_a5f
4455 +    :try_end_537
4456 +    .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_a64
4457
4458      move-object/from16 v103, v104
4459
4460 -    :goto_534
4461 -    :try_start_534
4462 +    :goto_539
4463 +    :try_start_539
4464      const-string v3, "SystemServer"
4465
4466      const-string v9, "UI Mode Manager Service"
4467 @@ -1588,13 +1627,13 @@
4468      move-object/from16 v0, v114
4469
4470      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4471 -    :try_end_542
4472 -    .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_979
4473 +    :try_end_547
4474 +    .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_97e
4475
4476      move-object/from16 v113, v114
4477
4478 -    :goto_544
4479 -    :try_start_544
4480 +    :goto_549
4481 +    :try_start_549
4482      const-string v3, "SystemServer"
4483
4484      const-string v9, "Backup Service"
4485 @@ -1608,11 +1647,11 @@
4486      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4487
4488      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4489 -    :try_end_555
4490 -    .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_985
4491 +    :try_end_55a
4492 +    .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_98a
4493
4494 -    :goto_555
4495 -    :try_start_555
4496 +    :goto_55a
4497 +    :try_start_55a
4498      const-string v3, "SystemServer"
4499
4500      const-string v9, "AppWidget Service"
4501 @@ -1624,22 +1663,22 @@
4502      move-object/from16 v0, v46
4503
4504      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4505 -    :try_end_563
4506 -    .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_563} :catch_991
4507 +    :try_end_568
4508 +    .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_568} :catch_996
4509
4510 -    :try_start_563
4511 +    :try_start_568
4512      const-string v3, "appwidget"
4513
4514      move-object/from16 v0, v46
4515
4516      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4517 -    :try_end_56a
4518 -    .catch Ljava/lang/Throwable; {:try_start_563 .. :try_end_56a} :catch_a5a
4519 +    :try_end_56f
4520 +    .catch Ljava/lang/Throwable; {:try_start_568 .. :try_end_56f} :catch_a5f
4521
4522      move-object/from16 v45, v46
4523
4524 -    :goto_56c
4525 -    :try_start_56c
4526 +    :goto_571
4527 +    :try_start_571
4528      const-string v3, "SystemServer"
4529
4530      const-string v9, "Recognition Service"
4531 @@ -1651,13 +1690,13 @@
4532      move-object/from16 v0, v100
4533
4534      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4535 -    :try_end_57a
4536 -    .catch Ljava/lang/Throwable; {:try_start_56c .. :try_end_57a} :catch_99d
4537 +    :try_end_57f
4538 +    .catch Ljava/lang/Throwable; {:try_start_571 .. :try_end_57f} :catch_9a2
4539
4540      move-object/from16 v99, v100
4541
4542 -    :goto_57c
4543 -    :try_start_57c
4544 +    :goto_581
4545 +    :try_start_581
4546      const-string v3, "SystemServer"
4547
4548      const-string v9, "DiskStats Service"
4549 @@ -1671,11 +1710,11 @@
4550      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4551
4552      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4553 -    :try_end_58d
4554 -    .catch Ljava/lang/Throwable; {:try_start_57c .. :try_end_58d} :catch_9a9
4555 +    :try_end_592
4556 +    .catch Ljava/lang/Throwable; {:try_start_581 .. :try_end_592} :catch_9ae
4557
4558 -    :goto_58d
4559 -    :try_start_58d
4560 +    :goto_592
4561 +    :try_start_592
4562      const-string v3, "SystemServer"
4563
4564      const-string v9, "SamplingProfiler Service"
4565 @@ -1689,11 +1728,11 @@
4566      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4567
4568      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4569 -    :try_end_59e
4570 -    .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_59e} :catch_9b5
4571 +    :try_end_5a3
4572 +    .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_5a3} :catch_9ba
4573
4574 -    :goto_59e
4575 -    :try_start_59e
4576 +    :goto_5a3
4577 +    :try_start_5a3
4578      const-string v3, "SystemServer"
4579
4580      const-string v9, "NetworkTimeUpdateService"
4581 @@ -1705,13 +1744,13 @@
4582      move-object/from16 v0, v89
4583
4584      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4585 -    :try_end_5ac
4586 -    .catch Ljava/lang/Throwable; {:try_start_59e .. :try_end_5ac} :catch_9c1
4587 +    :try_end_5b1
4588 +    .catch Ljava/lang/Throwable; {:try_start_5a3 .. :try_end_5b1} :catch_9c6
4589
4590      move-object/from16 v88, v89
4591
4592 -    :goto_5ae
4593 -    :try_start_5ae
4594 +    :goto_5b3
4595 +    :try_start_5b3
4596      const-string v3, "SystemServer"
4597
4598      const-string v9, "CommonTimeManagementService"
4599 @@ -1723,22 +1762,22 @@
4600      move-object/from16 v0, v54
4601
4602      invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4603 -    :try_end_5bc
4604 -    .catch Ljava/lang/Throwable; {:try_start_5ae .. :try_end_5bc} :catch_9cd
4605 +    :try_end_5c1
4606 +    .catch Ljava/lang/Throwable; {:try_start_5b3 .. :try_end_5c1} :catch_9d2
4607
4608 -    :try_start_5bc
4609 +    :try_start_5c1
4610      const-string v3, "commontime_management"
4611
4612      move-object/from16 v0, v54
4613
4614      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4615 -    :try_end_5c3
4616 -    .catch Ljava/lang/Throwable; {:try_start_5bc .. :try_end_5c3} :catch_a55
4617 +    :try_end_5c8
4618 +    .catch Ljava/lang/Throwable; {:try_start_5c1 .. :try_end_5c8} :catch_a5a
4619
4620      move-object/from16 v53, v54
4621
4622 -    :goto_5c5
4623 -    :try_start_5c5
4624 +    :goto_5ca
4625 +    :try_start_5ca
4626      const-string v3, "SystemServer"
4627
4628      const-string v9, "CertBlacklister"
4629 @@ -1748,10 +1787,10 @@
4630      new-instance v3, Lcom/android/server/CertBlacklister;
4631
4632      invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4633 -    :try_end_5d1
4634 -    .catch Ljava/lang/Throwable; {:try_start_5c5 .. :try_end_5d1} :catch_9d9
4635 +    :try_end_5d6
4636 +    .catch Ljava/lang/Throwable; {:try_start_5ca .. :try_end_5d6} :catch_9de
4637
4638 -    :goto_5d1
4639 +    :goto_5d6
4640      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4641
4642      move-result-object v3
4643 @@ -1762,9 +1801,9 @@
4644
4645      move-result v3
4646
4647 -    if-eqz v3, :cond_5f5
4648 +    if-eqz v3, :cond_5fa
4649
4650 -    :try_start_5de
4651 +    :try_start_5e3
4652      const-string v3, "SystemServer"
4653
4654      const-string v9, "Dreams Service"
4655 @@ -1776,23 +1815,23 @@
4656      move-object/from16 v0, v67
4657
4658      invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4659 -    :try_end_5ec
4660 -    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5ec} :catch_9e5
4661 +    :try_end_5f1
4662 +    .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5f1} :catch_9ea
4663
4664 -    :try_start_5ec
4665 +    :try_start_5f1
4666      const-string v3, "dreams"
4667
4668      move-object/from16 v0, v67
4669
4670      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4671 -    :try_end_5f3
4672 -    .catch Ljava/lang/Throwable; {:try_start_5ec .. :try_end_5f3} :catch_a51
4673 +    :try_end_5f8
4674 +    .catch Ljava/lang/Throwable; {:try_start_5f1 .. :try_end_5f8} :catch_a56
4675
4676      move-object/from16 v66, v67
4677
4678 -    :cond_5f5
4679 -    :goto_5f5
4680 -    :try_start_5f5
4681 +    :cond_5fa
4682 +    :goto_5fa
4683 +    :try_start_5fa
4684      const-string v3, "SystemServer"
4685
4686      const-string v9, "AssetRedirectionManager Service"
4687 @@ -1806,10 +1845,10 @@
4688      invoke-direct {v9, v4}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
4689
4690      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4691 -    :try_end_606
4692 -    .catch Ljava/lang/Throwable; {:try_start_5f5 .. :try_end_606} :catch_9f1
4693 +    :try_end_60b
4694 +    .catch Ljava/lang/Throwable; {:try_start_5fa .. :try_end_60b} :catch_9f6
4695
4696 -    :goto_606
4697 +    :goto_60b
4698      move-object/from16 v0, p0
4699
4700      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4701 @@ -1854,7 +1893,7 @@
4702
4703      move-result v29
4704
4705 -    if-eqz v29, :cond_9fd
4706 +    if-eqz v29, :cond_a02
4707
4708      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4709
4710 @@ -1872,38 +1911,38 @@
4711
4712      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4713
4714 -    :goto_647
4715 -    :try_start_647
4716 -    invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
4717 -    :try_end_64a
4718 -    .catch Ljava/lang/Throwable; {:try_start_647 .. :try_end_64a} :catch_a06
4719 -
4720 -    :goto_64a
4721 -    if-eqz v62, :cond_64f
4722 -
4723 +    :goto_64c
4724      :try_start_64c
4725 -    invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4726 +    invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
4727      :try_end_64f
4728 -    .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a12
4729 +    .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a0b
4730
4731 -    :cond_64f
4732      :goto_64f
4733 -    if-eqz v90, :cond_654
4734 +    if-eqz v62, :cond_654
4735
4736      :try_start_651
4737 -    invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
4738 +    invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4739      :try_end_654
4740 -    .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a1e
4741 +    .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a17
4742
4743      :cond_654
4744      :goto_654
4745 -    :try_start_654
4746 +    if-eqz v90, :cond_659
4747 +
4748 +    :try_start_656
4749 +    invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
4750 +    :try_end_659
4751 +    .catch Ljava/lang/Throwable; {:try_start_656 .. :try_end_659} :catch_a23
4752 +
4753 +    :cond_659
4754 +    :goto_659
4755 +    :try_start_659
4756      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4757 -    :try_end_657
4758 -    .catch Ljava/lang/Throwable; {:try_start_654 .. :try_end_657} :catch_a2a
4759 +    :try_end_65c
4760 +    .catch Ljava/lang/Throwable; {:try_start_659 .. :try_end_65c} :catch_a2f
4761
4762 -    :goto_657
4763 -    if-eqz v29, :cond_660
4764 +    :goto_65c
4765 +    if-eqz v29, :cond_665
4766
4767      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4768
4769 @@ -1911,7 +1950,7 @@
4770
4771      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4772
4773 -    :cond_660
4774 +    :cond_665
4775      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4776
4777      move-result-object v55
4778 @@ -1948,18 +1987,18 @@
4779
4780      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4781
4782 -    :try_start_688
4783 +    :try_start_68d
4784      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->systemReady()V
4785 -    :try_end_68b
4786 -    .catch Ljava/lang/Throwable; {:try_start_688 .. :try_end_68b} :catch_a36
4787 +    :try_end_690
4788 +    .catch Ljava/lang/Throwable; {:try_start_68d .. :try_end_690} :catch_a3b
4789
4790 -    :goto_68b
4791 -    :try_start_68b
4792 +    :goto_690
4793 +    :try_start_690
4794      invoke-virtual/range {v81 .. v81}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4795 -    :try_end_68e
4796 -    .catch Ljava/lang/Throwable; {:try_start_68b .. :try_end_68e} :catch_a42
4797 +    :try_end_693
4798 +    .catch Ljava/lang/Throwable; {:try_start_690 .. :try_end_693} :catch_a47
4799
4800 -    :goto_68e
4801 +    :goto_693
4802      new-instance v71, Landroid/content/IntentFilter;
4803
4804      invoke-direct/range {v71 .. v71}, Landroid/content/IntentFilter;-><init>()V
4805 @@ -2072,7 +2111,7 @@
4806
4807      move-result v3
4808
4809 -    if-eqz v3, :cond_712
4810 +    if-eqz v3, :cond_717
4811
4812      const-string v3, "SystemServer"
4813
4814 @@ -2080,7 +2119,7 @@
4815
4816      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4817
4818 -    :cond_712
4819 +    :cond_717
4820      invoke-static {}, Landroid/os/Looper;->loop()V
4821
4822      const-string v3, "SystemServer"
4823 @@ -2091,25 +2130,25 @@
4824
4825      return-void
4826
4827 -    :cond_71d
4828 +    :cond_722
4829      const/16 v98, 0x0
4830
4831      goto/16 :goto_35
4832
4833 -    :cond_721
4834 +    :cond_726
4835      const/16 v97, 0x0
4836
4837      goto/16 :goto_47
4838
4839 -    :cond_725
4840 +    :cond_72a
4841      invoke-static/range {v70 .. v70}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4842
4843      move-result v69
4844
4845      goto/16 :goto_60
4846
4847 -    :cond_72b
4848 -    :try_start_72b
4849 +    :cond_730
4850 +    :try_start_730
4851      const-string v3, "1"
4852
4853      move-object/from16 v0, v61
4854 @@ -2130,15 +2169,15 @@
4855
4856      goto/16 :goto_119
4857
4858 -    :cond_740
4859 +    :cond_745
4860      const/4 v3, 0x0
4861
4862      goto/16 :goto_11c
4863
4864 -    :catch_743
4865 +    :catch_748
4866      move-exception v68
4867
4868 -    :goto_744
4869 +    :goto_749
4870      const-string v3, "SystemServer"
4871
4872      const-string v9, "Failure starting Account Manager"
4873 @@ -2146,19 +2185,19 @@
4874      move-object/from16 v0, v68
4875
4876      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4877 -    :try_end_74d
4878 -    .catch Ljava/lang/RuntimeException; {:try_start_72b .. :try_end_74d} :catch_74f
4879 +    :try_end_752
4880 +    .catch Ljava/lang/RuntimeException; {:try_start_730 .. :try_end_752} :catch_754
4881
4882      goto/16 :goto_14a
4883
4884 -    :catch_74f
4885 +    :catch_754
4886      move-exception v68
4887
4888      move-object/from16 v7, v44
4889
4890      move-object/from16 v5, v47
4891
4892 -    :goto_754
4893 +    :goto_759
4894      const-string v3, "System"
4895
4896      const-string v9, "******************************************"
4897 @@ -2173,51 +2212,51 @@
4898
4899      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4900
4901 -    goto/16 :goto_212
4902 +    goto/16 :goto_217
4903
4904 -    :cond_766
4905 +    :cond_76b
4906      const/4 v3, 0x0
4907
4908      goto/16 :goto_157
4909
4910 -    :cond_769
4911 +    :cond_76e
4912      const/4 v3, 0x0
4913
4914      move v9, v3
4915
4916 -    goto/16 :goto_1d5
4917 +    goto/16 :goto_1da
4918
4919 -    :cond_76d
4920 +    :cond_772
4921      const/4 v3, 0x0
4922
4923 -    goto/16 :goto_1d8
4924 +    goto/16 :goto_1dd
4925
4926 -    :cond_770
4927 +    :cond_775
4928      const/4 v3, 0x1
4929
4930      move/from16 v0, v69
4931
4932 -    if-ne v0, v3, :cond_784
4933 +    if-ne v0, v3, :cond_789
4934
4935 -    :try_start_775
4936 +    :try_start_77a
4937      const-string v3, "SystemServer"
4938
4939      const-string v9, "No Bluetooth Service (factory test)"
4940
4941      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4942
4943 -    goto/16 :goto_20e
4944 +    goto/16 :goto_213
4945
4946 -    :catch_77e
4947 +    :catch_783
4948      move-exception v68
4949
4950      move-object/from16 v117, v118
4951
4952      move-object/from16 v77, v78
4953
4954 -    goto :goto_754
4955 +    goto :goto_759
4956
4957 -    :cond_784
4958 +    :cond_789
4959      const-string v3, "SystemServer"
4960
4961      const-string v9, "Bluetooth Service"
4962 @@ -2229,10 +2268,10 @@
4963      move-object/from16 v0, v49
4964
4965      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4966 -    :try_end_792
4967 -    .catch Ljava/lang/RuntimeException; {:try_start_775 .. :try_end_792} :catch_77e
4968 +    :try_end_797
4969 +    .catch Ljava/lang/RuntimeException; {:try_start_77a .. :try_end_797} :catch_783
4970
4971 -    :try_start_792
4972 +    :try_start_797
4973      const-string v3, "bluetooth"
4974
4975      move-object/from16 v0, v49
4976 @@ -2253,7 +2292,7 @@
4977
4978      move-result v3
4979
4980 -    if-nez v3, :cond_7bf
4981 +    if-nez v3, :cond_7c4
4982
4983      new-instance v51, Landroid/server/BluetoothA2dpService;
4984
4985 @@ -2262,10 +2301,10 @@
4986      move-object/from16 v1, v49
4987
4988      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4989 -    :try_end_7b3
4990 -    .catch Ljava/lang/RuntimeException; {:try_start_792 .. :try_end_7b3} :catch_aea
4991 +    :try_end_7b8
4992 +    .catch Ljava/lang/RuntimeException; {:try_start_797 .. :try_end_7b8} :catch_aef
4993
4994 -    :try_start_7b3
4995 +    :try_start_7b8
4996      const-string v3, "bluetooth_a2dp"
4997
4998      move-object/from16 v0, v51
4999 @@ -2273,13 +2312,13 @@
5000      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
5001
5002      invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
5003 -    :try_end_7bd
5004 -    .catch Ljava/lang/RuntimeException; {:try_start_7b3 .. :try_end_7bd} :catch_af3
5005 +    :try_end_7c2
5006 +    .catch Ljava/lang/RuntimeException; {:try_start_7b8 .. :try_end_7c2} :catch_af8
5007
5008      move-object/from16 v50, v51
5009
5010 -    :cond_7bf
5011 -    :try_start_7bf
5012 +    :cond_7c4
5013 +    :try_start_7c4
5014      move-object/from16 v0, p0
5015
5016      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
5017 @@ -2292,21 +2331,21 @@
5018
5019      move-result v52
5020
5021 -    if-eqz v52, :cond_7cf
5022 +    if-eqz v52, :cond_7d4
5023
5024      invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->enable()Z
5025 -    :try_end_7cf
5026 -    .catch Ljava/lang/RuntimeException; {:try_start_7bf .. :try_end_7cf} :catch_aea
5027 +    :try_end_7d4
5028 +    .catch Ljava/lang/RuntimeException; {:try_start_7c4 .. :try_end_7d4} :catch_aef
5029
5030 -    :cond_7cf
5031 +    :cond_7d4
5032      move-object/from16 v48, v49
5033
5034 -    goto/16 :goto_20e
5035 +    goto/16 :goto_213
5036
5037 -    :catch_7d3
5038 +    :catch_7d8
5039      move-exception v68
5040
5041 -    :goto_7d4
5042 +    :goto_7d9
5043      const-string v3, "starting Input Manager Service"
5044
5045      move-object/from16 v0, p0
5046 @@ -2315,9 +2354,9 @@
5047
5048      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5049
5050 -    goto/16 :goto_253
5051 +    goto/16 :goto_258
5052
5053 -    :catch_7df
5054 +    :catch_7e4
5055      move-exception v68
5056
5057      const-string v3, "starting Accessibility Manager"
5058 @@ -2328,9 +2367,9 @@
5059
5060      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5061
5062 -    goto/16 :goto_264
5063 +    goto/16 :goto_269
5064
5065 -    :catch_7eb
5066 +    :catch_7f0
5067      move-exception v68
5068
5069      const-string v3, "making display ready"
5070 @@ -2341,9 +2380,9 @@
5071
5072      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5073
5074 -    goto/16 :goto_267
5075 +    goto/16 :goto_26c
5076
5077 -    :catch_7f7
5078 +    :catch_7fc
5079      move-exception v68
5080
5081      const-string v3, "performing boot dexopt"
5082 @@ -2354,12 +2393,12 @@
5083
5084      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5085
5086 -    goto/16 :goto_26a
5087 +    goto/16 :goto_26f
5088
5089 -    :catch_803
5090 +    :catch_808
5091      move-exception v68
5092
5093 -    :goto_804
5094 +    :goto_809
5095      const-string v3, "starting Mount Service"
5096
5097      move-object/from16 v0, p0
5098 @@ -2368,12 +2407,12 @@
5099
5100      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5101
5102 -    goto/16 :goto_2a9
5103 +    goto/16 :goto_2ae
5104
5105 -    :catch_80f
5106 +    :catch_814
5107      move-exception v68
5108
5109 -    :goto_810
5110 +    :goto_815
5111      const-string v3, "starting LockSettingsService service"
5112
5113      move-object/from16 v0, p0
5114 @@ -2382,12 +2421,12 @@
5115
5116      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5117
5118 -    goto/16 :goto_2c0
5119 +    goto/16 :goto_2c5
5120
5121 -    :catch_81b
5122 +    :catch_820
5123      move-exception v68
5124
5125 -    :goto_81c
5126 +    :goto_821
5127      const-string v3, "starting DevicePolicyService"
5128
5129      move-object/from16 v0, p0
5130 @@ -2396,12 +2435,12 @@
5131
5132      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5133
5134 -    goto/16 :goto_2d7
5135 +    goto/16 :goto_2dc
5136
5137 -    :catch_827
5138 +    :catch_82c
5139      move-exception v68
5140
5141 -    :goto_828
5142 +    :goto_82d
5143      const-string v3, "starting StatusBarManagerService"
5144
5145      move-object/from16 v0, p0
5146 @@ -2410,9 +2449,9 @@
5147
5148      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5149
5150 -    goto/16 :goto_2f0
5151 +    goto/16 :goto_2f5
5152
5153 -    :catch_833
5154 +    :catch_838
5155      move-exception v68
5156
5157      const-string v3, "starting Clipboard Service"
5158 @@ -2423,9 +2462,9 @@
5159
5160      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5161
5162 -    goto/16 :goto_301
5163 +    goto/16 :goto_306
5164
5165 -    :catch_83f
5166 +    :catch_844
5167      move-exception v68
5168
5169      const-string v3, "starting NetworkManagement Service"
5170 @@ -2436,12 +2475,12 @@
5171
5172      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5173
5174 -    goto/16 :goto_311
5175 +    goto/16 :goto_316
5176
5177 -    :catch_84b
5178 +    :catch_850
5179      move-exception v68
5180
5181 -    :goto_84c
5182 +    :goto_851
5183      const-string v3, "starting Text Service Manager Service"
5184
5185      move-object/from16 v0, p0
5186 @@ -2450,12 +2489,12 @@
5187
5188      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5189
5190 -    goto/16 :goto_328
5191 +    goto/16 :goto_32d
5192
5193 -    :catch_857
5194 +    :catch_85c
5195      move-exception v68
5196
5197 -    :goto_858
5198 +    :goto_85d
5199      const-string v3, "starting NetworkStats Service"
5200
5201      move-object/from16 v0, p0
5202 @@ -2464,14 +2503,14 @@
5203
5204      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5205
5206 -    goto/16 :goto_33f
5207 +    goto/16 :goto_344
5208
5209 -    :catch_863
5210 +    :catch_868
5211      move-exception v68
5212
5213      move-object/from16 v8, v86
5214
5215 -    :goto_866
5216 +    :goto_86b
5217      const-string v3, "starting NetworkPolicy Service"
5218
5219      move-object/from16 v0, p0
5220 @@ -2480,12 +2519,12 @@
5221
5222      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5223
5224 -    goto/16 :goto_356
5225 +    goto/16 :goto_35b
5226
5227 -    :catch_871
5228 +    :catch_876
5229      move-exception v68
5230
5231 -    :goto_872
5232 +    :goto_877
5233      const-string v3, "starting Wi-Fi P2pService"
5234
5235      move-object/from16 v0, p0
5236 @@ -2494,12 +2533,12 @@
5237
5238      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5239
5240 -    goto/16 :goto_36d
5241 +    goto/16 :goto_372
5242
5243 -    :catch_87d
5244 +    :catch_882
5245      move-exception v68
5246
5247 -    :goto_87e
5248 +    :goto_883
5249      const-string v3, "starting Wi-Fi Service"
5250
5251      move-object/from16 v0, p0
5252 @@ -2508,12 +2547,12 @@
5253
5254      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5255
5256 -    goto/16 :goto_384
5257 +    goto/16 :goto_389
5258
5259 -    :catch_889
5260 +    :catch_88e
5261      move-exception v68
5262
5263 -    :goto_88a
5264 +    :goto_88f
5265      const-string v3, "starting Connectivity Service"
5266
5267      move-object/from16 v0, p0
5268 @@ -2522,9 +2561,9 @@
5269
5270      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5271
5272 -    goto/16 :goto_3ab
5273 +    goto/16 :goto_3b0
5274
5275 -    :catch_895
5276 +    :catch_89a
5277      move-exception v68
5278
5279      const-string v3, "starting Service Discovery Service"
5280 @@ -2535,12 +2574,12 @@
5281
5282      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5283
5284 -    goto/16 :goto_3bd
5285 +    goto/16 :goto_3c2
5286
5287 -    :catch_8a1
5288 +    :catch_8a6
5289      move-exception v68
5290
5291 -    :goto_8a2
5292 +    :goto_8a7
5293      const-string v3, "starting ThrottleService"
5294
5295      move-object/from16 v0, p0
5296 @@ -2549,9 +2588,9 @@
5297
5298      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5299
5300 -    goto/16 :goto_3d4
5301 +    goto/16 :goto_3d9
5302
5303 -    :catch_8ad
5304 +    :catch_8b2
5305      move-exception v68
5306
5307      const-string v3, "starting UpdateLockService"
5308 @@ -2562,12 +2601,12 @@
5309
5310      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5311
5312 -    goto/16 :goto_3e5
5313 +    goto/16 :goto_3ea
5314
5315 -    :catch_8b9
5316 +    :catch_8be
5317      move-exception v68
5318
5319 -    :goto_8ba
5320 +    :goto_8bf
5321      const-string v3, "SystemServer"
5322
5323      const-string v9, "Failure starting Profile Manager"
5324 @@ -2576,9 +2615,9 @@
5325
5326      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5327
5328 -    goto/16 :goto_401
5329 +    goto/16 :goto_406
5330
5331 -    :catch_8c5
5332 +    :catch_8ca
5333      move-exception v68
5334
5335      const-string v3, "making Account Manager Service ready"
5336 @@ -2589,9 +2628,9 @@
5337
5338      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5339
5340 -    goto/16 :goto_406
5341 +    goto/16 :goto_40b
5342
5343 -    :catch_8d1
5344 +    :catch_8d6
5345      move-exception v68
5346
5347      const-string v3, "making Content Service ready"
5348 @@ -2602,12 +2641,12 @@
5349
5350      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5351
5352 -    goto/16 :goto_40b
5353 +    goto/16 :goto_410
5354
5355 -    :catch_8dd
5356 +    :catch_8e2
5357      move-exception v68
5358
5359 -    :goto_8de
5360 +    :goto_8e3
5361      const-string v3, "starting Notification Manager"
5362
5363      move-object/from16 v0, p0
5364 @@ -2616,9 +2655,9 @@
5365
5366      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5367
5368 -    goto/16 :goto_42b
5369 +    goto/16 :goto_430
5370
5371 -    :catch_8e9
5372 +    :catch_8ee
5373      move-exception v68
5374
5375      const-string v3, "starting DeviceStorageMonitor service"
5376 @@ -2629,12 +2668,12 @@
5377
5378      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5379
5380 -    goto/16 :goto_43c
5381 +    goto/16 :goto_441
5382
5383 -    :catch_8f5
5384 +    :catch_8fa
5385      move-exception v68
5386
5387 -    :goto_8f6
5388 +    :goto_8fb
5389      const-string v3, "starting Location Manager"
5390
5391      move-object/from16 v0, p0
5392 @@ -2643,12 +2682,12 @@
5393
5394      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5395
5396 -    goto/16 :goto_453
5397 +    goto/16 :goto_458
5398
5399 -    :catch_901
5400 +    :catch_906
5401      move-exception v68
5402
5403 -    :goto_902
5404 +    :goto_907
5405      const-string v3, "starting Country Detector"
5406
5407      move-object/from16 v0, p0
5408 @@ -2657,9 +2696,9 @@
5409
5410      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5411
5412 -    goto/16 :goto_46a
5413 +    goto/16 :goto_46f
5414
5415 -    :catch_90d
5416 +    :catch_912
5417      move-exception v68
5418
5419      const-string v3, "starting Search Service"
5420 @@ -2670,9 +2709,9 @@
5421
5422      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5423
5424 -    goto/16 :goto_47b
5425 +    goto/16 :goto_480
5426
5427 -    :catch_919
5428 +    :catch_91e
5429      move-exception v68
5430
5431      const-string v3, "starting DropBoxManagerService"
5432 @@ -2683,12 +2722,12 @@
5433
5434      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5435
5436 -    goto/16 :goto_493
5437 +    goto/16 :goto_498
5438
5439 -    :catch_925
5440 +    :catch_92a
5441      move-exception v68
5442
5443 -    :goto_926
5444 +    :goto_92b
5445      const-string v3, "starting Wallpaper Service"
5446
5447      move-object/from16 v0, p0
5448 @@ -2697,9 +2736,9 @@
5449
5450      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5451
5452 -    goto/16 :goto_4b9
5453 +    goto/16 :goto_4be
5454
5455 -    :catch_931
5456 +    :catch_936
5457      move-exception v68
5458
5459      const-string v3, "starting Audio Service"
5460 @@ -2710,9 +2749,9 @@
5461
5462      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5463
5464 -    goto/16 :goto_4d8
5465 +    goto/16 :goto_4dd
5466
5467 -    :catch_93d
5468 +    :catch_942
5469      move-exception v68
5470
5471      const-string v3, "starting DockObserver"
5472 @@ -2723,9 +2762,9 @@
5473
5474      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5475
5476 -    goto/16 :goto_4e8
5477 +    goto/16 :goto_4ed
5478
5479 -    :catch_949
5480 +    :catch_94e
5481      move-exception v68
5482
5483      const-string v3, "starting RotationSwitchObserver"
5484 @@ -2736,9 +2775,9 @@
5485
5486      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5487
5488 -    goto/16 :goto_4fa
5489 +    goto/16 :goto_4ff
5490
5491 -    :catch_955
5492 +    :catch_95a
5493      move-exception v68
5494
5495      const-string v3, "starting WiredAccessoryObserver"
5496 @@ -2749,12 +2788,12 @@
5497
5498      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5499
5500 -    goto/16 :goto_506
5501 +    goto/16 :goto_50b
5502
5503 -    :catch_961
5504 +    :catch_966
5505      move-exception v68
5506
5507 -    :goto_962
5508 +    :goto_967
5509      const-string v3, "starting UsbService"
5510
5511      move-object/from16 v0, p0
5512 @@ -2763,12 +2802,12 @@
5513
5514      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5515
5516 -    goto/16 :goto_51d
5517 +    goto/16 :goto_522
5518
5519 -    :catch_96d
5520 +    :catch_972
5521      move-exception v68
5522
5523 -    :goto_96e
5524 +    :goto_973
5525      const-string v3, "SystemServer"
5526
5527      const-string v9, "Failure starting SerialService"
5528 @@ -2777,9 +2816,9 @@
5529
5530      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5531
5532 -    goto/16 :goto_534
5533 +    goto/16 :goto_539
5534
5535 -    :catch_979
5536 +    :catch_97e
5537      move-exception v68
5538
5539      const-string v3, "starting UiModeManagerService"
5540 @@ -2790,9 +2829,9 @@
5541
5542      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5543
5544 -    goto/16 :goto_544
5545 +    goto/16 :goto_549
5546
5547 -    :catch_985
5548 +    :catch_98a
5549      move-exception v68
5550
5551      const-string v3, "SystemServer"
5552 @@ -2803,12 +2842,12 @@
5553
5554      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5555
5556 -    goto/16 :goto_555
5557 +    goto/16 :goto_55a
5558
5559 -    :catch_991
5560 +    :catch_996
5561      move-exception v68
5562
5563 -    :goto_992
5564 +    :goto_997
5565      const-string v3, "starting AppWidget Service"
5566
5567      move-object/from16 v0, p0
5568 @@ -2817,9 +2856,9 @@
5569
5570      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5571
5572 -    goto/16 :goto_56c
5573 +    goto/16 :goto_571
5574
5575 -    :catch_99d
5576 +    :catch_9a2
5577      move-exception v68
5578
5579      const-string v3, "starting Recognition Service"
5580 @@ -2830,9 +2869,9 @@
5581
5582      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5583
5584 -    goto/16 :goto_57c
5585 +    goto/16 :goto_581
5586
5587 -    :catch_9a9
5588 +    :catch_9ae
5589      move-exception v68
5590
5591      const-string v3, "starting DiskStats Service"
5592 @@ -2843,9 +2882,9 @@
5593
5594      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5595
5596 -    goto/16 :goto_58d
5597 +    goto/16 :goto_592
5598
5599 -    :catch_9b5
5600 +    :catch_9ba
5601      move-exception v68
5602
5603      const-string v3, "starting SamplingProfiler Service"
5604 @@ -2856,9 +2895,9 @@
5605
5606      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5607
5608 -    goto/16 :goto_59e
5609 +    goto/16 :goto_5a3
5610
5611 -    :catch_9c1
5612 +    :catch_9c6
5613      move-exception v68
5614
5615      const-string v3, "starting NetworkTimeUpdate service"
5616 @@ -2869,12 +2908,12 @@
5617
5618      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5619
5620 -    goto/16 :goto_5ae
5621 +    goto/16 :goto_5b3
5622
5623 -    :catch_9cd
5624 +    :catch_9d2
5625      move-exception v68
5626
5627 -    :goto_9ce
5628 +    :goto_9d3
5629      const-string v3, "starting CommonTimeManagementService service"
5630
5631      move-object/from16 v0, p0
5632 @@ -2883,9 +2922,9 @@
5633
5634      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5635
5636 -    goto/16 :goto_5c5
5637 +    goto/16 :goto_5ca
5638
5639 -    :catch_9d9
5640 +    :catch_9de
5641      move-exception v68
5642
5643      const-string v3, "starting CertBlacklister"
5644 @@ -2896,12 +2935,12 @@
5645
5646      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5647
5648 -    goto/16 :goto_5d1
5649 +    goto/16 :goto_5d6
5650
5651 -    :catch_9e5
5652 +    :catch_9ea
5653      move-exception v68
5654
5655 -    :goto_9e6
5656 +    :goto_9eb
5657      const-string v3, "starting DreamManagerService"
5658
5659      move-object/from16 v0, p0
5660 @@ -2910,9 +2949,9 @@
5661
5662      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5663
5664 -    goto/16 :goto_5f5
5665 +    goto/16 :goto_5fa
5666
5667 -    :catch_9f1
5668 +    :catch_9f6
5669      move-exception v68
5670
5671      const-string v3, "SystemServer"
5672 @@ -2923,18 +2962,18 @@
5673
5674      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5675
5676 -    goto/16 :goto_606
5677 +    goto/16 :goto_60b
5678
5679 -    :cond_9fd
5680 +    :cond_a02
5681      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5682
5683      move-result-object v3
5684
5685      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5686
5687 -    goto/16 :goto_647
5688 +    goto/16 :goto_64c
5689
5690 -    :catch_a06
5691 +    :catch_a0b
5692      move-exception v68
5693
5694      const-string v3, "making Vibrator Service ready"
5695 @@ -2945,9 +2984,9 @@
5696
5697      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5698
5699 -    goto/16 :goto_64a
5700 +    goto/16 :goto_64f
5701
5702 -    :catch_a12
5703 +    :catch_a17
5704      move-exception v68
5705
5706      const-string v3, "making Device Policy Service ready"
5707 @@ -2958,9 +2997,9 @@
5708
5709      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5710
5711 -    goto/16 :goto_64f
5712 +    goto/16 :goto_654
5713
5714 -    :catch_a1e
5715 +    :catch_a23
5716      move-exception v68
5717
5718      const-string v3, "making Notification Service ready"
5719 @@ -2971,9 +3010,9 @@
5720
5721      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5722
5723 -    goto/16 :goto_654
5724 +    goto/16 :goto_659
5725
5726 -    :catch_a2a
5727 +    :catch_a2f
5728      move-exception v68
5729
5730      const-string v3, "making Window Manager Service ready"
5731 @@ -2984,9 +3023,9 @@
5732
5733      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5734
5735 -    goto/16 :goto_657
5736 +    goto/16 :goto_65c
5737
5738 -    :catch_a36
5739 +    :catch_a3b
5740      move-exception v68
5741
5742      const-string v3, "making Package Manager Service ready"
5743 @@ -2997,9 +3036,9 @@
5744
5745      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5746
5747 -    goto/16 :goto_68b
5748 +    goto/16 :goto_690
5749
5750 -    :catch_a42
5751 +    :catch_a47
5752      move-exception v68
5753
5754      const-string v3, "making Lock Settings Service ready"
5755 @@ -3010,171 +3049,171 @@
5756
5757      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5758
5759 -    goto/16 :goto_68e
5760 +    goto/16 :goto_693
5761
5762 -    :catch_a4e
5763 +    :catch_a53
5764      move-exception v3
5765
5766      goto/16 :goto_128
5767
5768 -    :catch_a51
5769 +    :catch_a56
5770      move-exception v68
5771
5772      move-object/from16 v66, v67
5773
5774 -    goto :goto_9e6
5775 +    goto :goto_9eb
5776
5777 -    :catch_a55
5778 +    :catch_a5a
5779      move-exception v68
5780
5781      move-object/from16 v53, v54
5782
5783 -    goto/16 :goto_9ce
5784 +    goto/16 :goto_9d3
5785
5786 -    :catch_a5a
5787 +    :catch_a5f
5788      move-exception v68
5789
5790      move-object/from16 v45, v46
5791
5792 -    goto/16 :goto_992
5793 +    goto/16 :goto_997
5794
5795 -    :catch_a5f
5796 +    :catch_a64
5797      move-exception v68
5798
5799      move-object/from16 v103, v104
5800
5801 -    goto/16 :goto_96e
5802 +    goto/16 :goto_973
5803
5804 -    :catch_a64
5805 +    :catch_a69
5806      move-exception v68
5807
5808      move-object/from16 v115, v116
5809
5810 -    goto/16 :goto_962
5811 +    goto/16 :goto_967
5812
5813 -    :catch_a69
5814 +    :catch_a6e
5815      move-exception v68
5816
5817      move-object/from16 v120, v121
5818
5819 -    goto/16 :goto_926
5820 +    goto/16 :goto_92b
5821
5822 -    :catch_a6e
5823 +    :catch_a73
5824      move-exception v68
5825
5826      move-object/from16 v59, v60
5827
5828 -    goto/16 :goto_902
5829 +    goto/16 :goto_907
5830
5831 -    :catch_a73
5832 +    :catch_a78
5833      move-exception v68
5834
5835      move-object/from16 v79, v80
5836
5837 -    goto/16 :goto_8f6
5838 +    goto/16 :goto_8fb
5839
5840 -    :catch_a78
5841 +    :catch_a7d
5842      move-exception v68
5843
5844      move-object/from16 v90, v91
5845
5846 -    goto/16 :goto_8de
5847 +    goto/16 :goto_8e3
5848
5849 -    :catch_a7d
5850 +    :catch_a82
5851      move-exception v68
5852
5853      move-object/from16 v95, v96
5854
5855 -    goto/16 :goto_8ba
5856 +    goto/16 :goto_8bf
5857
5858 -    :catch_a82
5859 +    :catch_a87
5860      move-exception v68
5861
5862      move-object/from16 v109, v110
5863
5864 -    goto/16 :goto_8a2
5865 +    goto/16 :goto_8a7
5866
5867 -    :catch_a87
5868 +    :catch_a8c
5869      move-exception v68
5870
5871      move-object/from16 v56, v57
5872
5873 -    goto/16 :goto_88a
5874 +    goto/16 :goto_88f
5875
5876 -    :catch_a8c
5877 +    :catch_a91
5878      move-exception v68
5879
5880      move-object/from16 v122, v123
5881
5882 -    goto/16 :goto_87e
5883 +    goto/16 :goto_883
5884
5885 -    :catch_a91
5886 +    :catch_a96
5887      move-exception v68
5888
5889      move-object/from16 v124, v125
5890
5891 -    goto/16 :goto_872
5892 +    goto/16 :goto_877
5893
5894 -    :catch_a96
5895 +    :catch_a9b
5896      move-exception v68
5897
5898 -    goto/16 :goto_866
5899 +    goto/16 :goto_86b
5900
5901 -    :catch_a99
5902 +    :catch_a9e
5903      move-exception v68
5904
5905      move-object/from16 v12, v87
5906
5907 -    goto/16 :goto_858
5908 +    goto/16 :goto_85d
5909
5910 -    :catch_a9e
5911 +    :catch_aa3
5912      move-exception v68
5913
5914      move-object/from16 v111, v112
5915
5916 -    goto/16 :goto_84c
5917 +    goto/16 :goto_851
5918
5919 -    :catch_aa3
5920 +    :catch_aa8
5921      move-exception v68
5922
5923      move-object/from16 v107, v108
5924
5925 -    goto/16 :goto_828
5926 +    goto/16 :goto_82d
5927
5928 -    :catch_aa8
5929 +    :catch_aad
5930      move-exception v68
5931
5932      move-object/from16 v62, v63
5933
5934 -    goto/16 :goto_81c
5935 +    goto/16 :goto_821
5936
5937 -    :catch_aad
5938 +    :catch_ab2
5939      move-exception v68
5940
5941      move-object/from16 v81, v82
5942
5943 -    goto/16 :goto_810
5944 +    goto/16 :goto_815
5945
5946 -    :catch_ab2
5947 +    :catch_ab7
5948      move-exception v68
5949
5950      move-object/from16 v84, v85
5951
5952 -    goto/16 :goto_804
5953 +    goto/16 :goto_809
5954
5955 -    :catch_ab7
5956 +    :catch_abc
5957      move-exception v3
5958
5959 -    goto/16 :goto_27d
5960 +    goto/16 :goto_282
5961
5962 -    :catch_aba
5963 +    :catch_abf
5964      move-exception v68
5965
5966      move-object/from16 v74, v75
5967
5968 -    goto/16 :goto_7d4
5969 +    goto/16 :goto_7d9
5970
5971 -    :catch_abf
5972 +    :catch_ac4
5973      move-exception v68
5974
5975      move-object/from16 v7, v44
5976 @@ -3183,9 +3222,9 @@
5977
5978      move-object/from16 v6, v94
5979
5980 -    goto/16 :goto_754
5981 +    goto/16 :goto_759
5982
5983 -    :catch_ac8
5984 +    :catch_acd
5985      move-exception v68
5986
5987      move-object/from16 v7, v44
5988 @@ -3194,9 +3233,9 @@
5989
5990      move-object/from16 v42, v43
5991
5992 -    goto/16 :goto_754
5993 +    goto/16 :goto_759
5994
5995 -    :catch_ad1
5996 +    :catch_ad6
5997      move-exception v68
5998
5999      move-object/from16 v7, v44
6000 @@ -3205,18 +3244,18 @@
6001
6002      move-object/from16 v77, v78
6003
6004 -    goto/16 :goto_754
6005 +    goto/16 :goto_759
6006
6007 -    :catch_ada
6008 +    :catch_adf
6009      move-exception v68
6010
6011      move-object/from16 v7, v44
6012
6013      move-object/from16 v77, v78
6014
6015 -    goto/16 :goto_754
6016 +    goto/16 :goto_759
6017
6018 -    :catch_ae1
6019 +    :catch_ae6
6020      move-exception v68
6021
6022      move-object/from16 v7, v44
6023 @@ -3225,9 +3264,9 @@
6024
6025      move-object/from16 v77, v78
6026
6027 -    goto/16 :goto_754
6028 +    goto/16 :goto_759
6029
6030 -    :catch_aea
6031 +    :catch_aef
6032      move-exception v68
6033
6034      move-object/from16 v48, v49
6035 @@ -3236,9 +3275,9 @@
6036
6037      move-object/from16 v77, v78
6038
6039 -    goto/16 :goto_754
6040 +    goto/16 :goto_759
6041
6042 -    :catch_af3
6043 +    :catch_af8
6044      move-exception v68
6045
6046      move-object/from16 v50, v51
6047 @@ -3249,17 +3288,17 @@
6048
6049      move-object/from16 v77, v78
6050
6051 -    goto/16 :goto_754
6052 +    goto/16 :goto_759
6053
6054 -    :catch_afe
6055 +    :catch_b03
6056      move-exception v68
6057
6058      move-object/from16 v42, v43
6059
6060 -    goto/16 :goto_744
6061 +    goto/16 :goto_749
6062
6063 -    :cond_b03
6064 +    :cond_b08
6065      move-object/from16 v8, v86
6066
6067 -    goto/16 :goto_606
6068 +    goto/16 :goto_60b
6069  .end method
6070 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali opd-services/smali/com/android/server/TelephonyRegistry$1.smali
6071 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali   2013-01-09 03:22:09.356291132 -0600
6072 +++ opd-services/smali/com/android/server/TelephonyRegistry$1.smali     1969-12-31 18:00:00.000000000 -0600
6073 @@ -1,14 +0,0 @@
6074 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
6075 -.super Ljava/lang/Object;
6076 -.source "TelephonyRegistry.java"
6077 -
6078 -
6079 -# annotations
6080 -.annotation system Ldalvik/annotation/EnclosingClass;
6081 -    value = Lcom/android/server/TelephonyRegistry;
6082 -.end annotation
6083 -
6084 -.annotation system Ldalvik/annotation/InnerClass;
6085 -    accessFlags = 0x1008
6086 -    name = null
6087 -.end annotation
6088 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali opd-services/smali/com/android/server/TelephonyRegistry$Record.smali
6089 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali      2013-01-09 03:22:09.356291132 -0600
6090 +++ opd-services/smali/com/android/server/TelephonyRegistry$Record.smali        2013-01-09 03:21:56.720228464 -0600
6091 @@ -1,4 +1,4 @@
6092 -.class Lcom/android/server/TelephonyRegistry$Record;
6093 +.class public Lcom/android/server/TelephonyRegistry$Record;
6094  .super Ljava/lang/Object;
6095  .source "TelephonyRegistry.java"
6096
6097 @@ -9,7 +9,7 @@
6098  .end annotation
6099
6100  .annotation system Ldalvik/annotation/InnerClass;
6101 -    accessFlags = 0xa
6102 +    accessFlags = 0x9
6103      name = "Record"
6104  .end annotation
6105
6106 @@ -25,18 +25,10 @@
6107
6108
6109  # direct methods
6110 -.method private constructor <init>()V
6111 +.method public constructor <init>()V
6112      .registers 1
6113
6114      invoke-direct {p0}, Ljava/lang/Object;-><init>()V
6115
6116      return-void
6117  .end method
6118 -
6119 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
6120 -    .registers 2
6121 -
6122 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6123 -
6124 -    return-void
6125 -.end method
6126 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali opd-services/smali/com/android/server/TelephonyRegistry.smali
6127 --- stock-services/smali/com/android/server/TelephonyRegistry.smali     2013-01-09 03:22:09.364291168 -0600
6128 +++ opd-services/smali/com/android/server/TelephonyRegistry.smali       2013-01-09 03:21:56.580227780 -0600
6129 @@ -6,7 +6,6 @@
6130  # annotations
6131  .annotation system Ldalvik/annotation/MemberClasses;
6132      value = {
6133 -        Lcom/android/server/TelephonyRegistry$1;,
6134          Lcom/android/server/TelephonyRegistry$Record;
6135      }
6136  .end annotation
6137 @@ -23,15 +22,15 @@
6138  # instance fields
6139  .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6140
6141 -.field private mCallForwarding:Z
6142 +.field protected mCallForwarding:Z
6143
6144 -.field private mCallIncomingNumber:Ljava/lang/String;
6145 +.field protected mCallIncomingNumber:Ljava/lang/String;
6146
6147 -.field private mCallState:I
6148 +.field protected mCallState:I
6149
6150 -.field private mCellInfo:Landroid/telephony/CellInfo;
6151 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6152
6153 -.field private mCellLocation:Landroid/os/Bundle;
6154 +.field protected mCellLocation:Landroid/os/Bundle;
6155
6156  .field private mConnectedApns:Ljava/util/ArrayList;
6157      .annotation system Ldalvik/annotation/Signature;
6158 @@ -44,9 +43,9 @@
6159      .end annotation
6160  .end field
6161
6162 -.field private final mContext:Landroid/content/Context;
6163 +.field protected final mContext:Landroid/content/Context;
6164
6165 -.field private mDataActivity:I
6166 +.field protected mDataActivity:I
6167
6168  .field private mDataConnectionApn:Ljava/lang/String;
6169
6170 @@ -54,19 +53,19 @@
6171
6172  .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6173
6174 -.field private mDataConnectionNetworkType:I
6175 +.field protected mDataConnectionNetworkType:I
6176
6177  .field private mDataConnectionPossible:Z
6178
6179  .field private mDataConnectionReason:Ljava/lang/String;
6180
6181 -.field private mDataConnectionState:I
6182 +.field protected mDataConnectionState:I
6183
6184 -.field private mMessageWaiting:Z
6185 +.field protected mMessageWaiting:Z
6186
6187 -.field private mOtaspMode:I
6188 +.field protected mOtaspMode:I
6189
6190 -.field private final mRecords:Ljava/util/ArrayList;
6191 +.field protected final mRecords:Ljava/util/ArrayList;
6192      .annotation system Ldalvik/annotation/Signature;
6193          value = {
6194              "Ljava/util/ArrayList",
6195 @@ -77,7 +76,7 @@
6196      .end annotation
6197  .end field
6198
6199 -.field private final mRemoveList:Ljava/util/ArrayList;
6200 +.field protected final mRemoveList:Ljava/util/ArrayList;
6201      .annotation system Ldalvik/annotation/Signature;
6202          value = {
6203              "Ljava/util/ArrayList",
6204 @@ -88,13 +87,13 @@
6205      .end annotation
6206  .end field
6207
6208 -.field private mServiceState:Landroid/telephony/ServiceState;
6209 +.field protected mServiceState:Landroid/telephony/ServiceState;
6210
6211 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6212 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6213
6214
6215  # direct methods
6216 -.method constructor <init>(Landroid/content/Context;)V
6217 +.method protected constructor <init>(Landroid/content/Context;)V
6218      .registers 5
6219
6220      const/4 v2, 0x0
6221 @@ -381,8 +380,8 @@
6222      return-void
6223  .end method
6224
6225 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6226 -    .registers 8
6227 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6228 +    .registers 7
6229
6230      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6231
6232 @@ -391,29 +390,29 @@
6233      :try_start_4
6234      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6235
6236 -    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6237 -
6238 -    move-result v5
6239 -
6240 -    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6241 -    :try_end_d
6242 -    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6243 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6244 +    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6245 +    :try_end_9
6246 +    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6247 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6248
6249 -    :goto_d
6250 +    :goto_9
6251      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6252
6253      new-instance v3, Landroid/content/Intent;
6254
6255 -    const-string v4, "android.intent.action.SERVICE_STATE"
6256 +    const-string v4, "android.intent.action.SIG_STR"
6257
6258      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6259
6260 +    const/high16 v4, 0x2000
6261 +
6262 +    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6263 +
6264      new-instance v0, Landroid/os/Bundle;
6265
6266      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6267
6268 -    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6269 +    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6270
6271      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6272
6273 @@ -423,21 +422,23 @@
6274
6275      return-void
6276
6277 -    :catchall_28
6278 +    :catchall_29
6279      move-exception v4
6280
6281      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6282
6283      throw v4
6284
6285 -    :catch_2d
6286 +    :catch_2e
6287      move-exception v4
6288
6289 -    goto :goto_d
6290 +    goto :goto_9
6291  .end method
6292
6293 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6294 -    .registers 7
6295 +
6296 +# virtual methods
6297 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6298 +    .registers 8
6299
6300      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6301
6302 @@ -446,29 +447,29 @@
6303      :try_start_4
6304      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6305
6306 -    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6307 -    :try_end_9
6308 -    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6309 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6310 +    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6311
6312 -    :goto_9
6313 +    move-result v5
6314 +
6315 +    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6316 +    :try_end_d
6317 +    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6318 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6319 +
6320 +    :goto_d
6321      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6322
6323      new-instance v3, Landroid/content/Intent;
6324
6325 -    const-string v4, "android.intent.action.SIG_STR"
6326 +    const-string v4, "android.intent.action.SERVICE_STATE"
6327
6328      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6329
6330 -    const/high16 v4, 0x2000
6331 -
6332 -    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6333 -
6334      new-instance v0, Landroid/os/Bundle;
6335
6336      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6337
6338 -    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6339 +    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6340
6341      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6342
6343 @@ -478,20 +479,20 @@
6344
6345      return-void
6346
6347 -    :catchall_29
6348 +    :catchall_28
6349      move-exception v4
6350
6351      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6352
6353      throw v4
6354
6355 -    :catch_2e
6356 +    :catch_2d
6357      move-exception v4
6358
6359 -    goto :goto_9
6360 +    goto :goto_d
6361  .end method
6362
6363 -.method private checkListenerPermission(I)V
6364 +.method protected checkListenerPermission(I)V
6365      .registers 5
6366
6367      const/4 v2, 0x0
6368 @@ -532,7 +533,7 @@
6369      return-void
6370  .end method
6371
6372 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6373 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6374      .registers 5
6375
6376      iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6377 @@ -602,111 +603,6 @@
6378      goto :goto_b
6379  .end method
6380
6381 -.method private handleRemoveListLocked()V
6382 -    .registers 4
6383 -
6384 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6385 -
6386 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6387 -
6388 -    move-result v2
6389 -
6390 -    if-lez v2, :cond_23
6391 -
6392 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6393 -
6394 -    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6395 -
6396 -    move-result-object v1
6397 -
6398 -    :goto_e
6399 -    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6400 -
6401 -    move-result v2
6402 -
6403 -    if-eqz v2, :cond_1e
6404 -
6405 -    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6406 -
6407 -    move-result-object v0
6408 -
6409 -    check-cast v0, Landroid/os/IBinder;
6410 -
6411 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6412 -
6413 -    goto :goto_e
6414 -
6415 -    :cond_1e
6416 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6417 -
6418 -    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6419 -
6420 -    :cond_23
6421 -    return-void
6422 -.end method
6423 -
6424 -.method private remove(Landroid/os/IBinder;)V
6425 -    .registers 6
6426 -
6427 -    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6428 -
6429 -    monitor-enter v3
6430 -
6431 -    :try_start_3
6432 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6433 -
6434 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6435 -
6436 -    move-result v1
6437 -
6438 -    const/4 v0, 0x0
6439 -
6440 -    :goto_a
6441 -    if-ge v0, v1, :cond_22
6442 -
6443 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6444 -
6445 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6446 -
6447 -    move-result-object v2
6448 -
6449 -    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6450 -
6451 -    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6452 -
6453 -    if-ne v2, p1, :cond_1f
6454 -
6455 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6456 -
6457 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6458 -
6459 -    monitor-exit v3
6460 -
6461 -    :goto_1e
6462 -    return-void
6463 -
6464 -    :cond_1f
6465 -    add-int/lit8 v0, v0, 0x1
6466 -
6467 -    goto :goto_a
6468 -
6469 -    :cond_22
6470 -    monitor-exit v3
6471 -
6472 -    goto :goto_1e
6473 -
6474 -    :catchall_24
6475 -    move-exception v2
6476 -
6477 -    monitor-exit v3
6478 -    :try_end_26
6479 -    .catchall {:try_start_3 .. :try_end_26} :catchall_24
6480 -
6481 -    throw v2
6482 -.end method
6483 -
6484 -
6485 -# virtual methods
6486  .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6487      .registers 10
6488
6489 @@ -1204,12 +1100,55 @@
6490      goto/16 :goto_32
6491  .end method
6492
6493 +.method protected handleRemoveListLocked()V
6494 +    .registers 4
6495 +
6496 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6497 +
6498 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6499 +
6500 +    move-result v2
6501 +
6502 +    if-lez v2, :cond_23
6503 +
6504 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6505 +
6506 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6507 +
6508 +    move-result-object v1
6509 +
6510 +    :goto_e
6511 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6512 +
6513 +    move-result v2
6514 +
6515 +    if-eqz v2, :cond_1e
6516 +
6517 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6518 +
6519 +    move-result-object v0
6520 +
6521 +    check-cast v0, Landroid/os/IBinder;
6522 +
6523 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6524 +
6525 +    goto :goto_e
6526 +
6527 +    :cond_1e
6528 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6529 +
6530 +    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6531 +
6532 +    :cond_23
6533 +    return-void
6534 +.end method
6535 +
6536  .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6537      .registers 17
6538
6539 -    if-eqz p3, :cond_133
6540 +    if-eqz p3, :cond_131
6541
6542 -    invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6543 +    invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6544
6545      iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6546
6547 @@ -1226,7 +1165,7 @@
6548
6549      invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6550      :try_end_12
6551 -    .catchall {:try_start_9 .. :try_end_12} :catchall_db
6552 +    .catchall {:try_start_9 .. :try_end_12} :catchall_da
6553
6554      move-result v0
6555
6556 @@ -1246,7 +1185,7 @@
6557
6558      check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6559      :try_end_1f
6560 -    .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6561 +    .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6562
6563      :try_start_1f
6564      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6565 @@ -1262,7 +1201,7 @@
6566
6567      iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6568      :try_end_2a
6569 -    .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6570 +    .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6571
6572      if-eqz p4, :cond_c1
6573
6574 @@ -1281,8 +1220,8 @@
6575
6576      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6577      :try_end_3c
6578 -    .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6579 -    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6580 +    .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6581 +    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6582
6583      :cond_3c
6584      :goto_3c
6585 @@ -1308,8 +1247,8 @@
6586      :cond_4d
6587      invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6588      :try_end_50
6589 -    .catchall {:try_start_40 .. :try_end_50} :catchall_db
6590 -    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6591 +    .catchall {:try_start_40 .. :try_end_50} :catchall_da
6592 +    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6593
6594      :cond_50
6595      :goto_50
6596 @@ -1324,8 +1263,8 @@
6597
6598      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6599      :try_end_5b
6600 -    .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6601 -    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6602 +    .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6603 +    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6604
6605      :cond_5b
6606      :goto_5b
6607 @@ -1340,8 +1279,8 @@
6608
6609      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6610      :try_end_66
6611 -    .catchall {:try_start_5f .. :try_end_66} :catchall_db
6612 -    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6613 +    .catchall {:try_start_5f .. :try_end_66} :catchall_da
6614 +    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6615
6616      :cond_66
6617      :goto_66
6618 @@ -1360,8 +1299,8 @@
6619
6620      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6621      :try_end_76
6622 -    .catchall {:try_start_6a .. :try_end_76} :catchall_db
6623 -    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6624 +    .catchall {:try_start_6a .. :try_end_76} :catchall_da
6625 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6626
6627      :cond_76
6628      :goto_76
6629 @@ -1378,8 +1317,8 @@
6630
6631      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6632      :try_end_83
6633 -    .catchall {:try_start_7a .. :try_end_83} :catchall_db
6634 -    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6635 +    .catchall {:try_start_7a .. :try_end_83} :catchall_da
6636 +    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6637
6638      :cond_83
6639      :goto_83
6640 @@ -1396,8 +1335,8 @@
6641
6642      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6643      :try_end_90
6644 -    .catchall {:try_start_87 .. :try_end_90} :catchall_db
6645 -    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6646 +    .catchall {:try_start_87 .. :try_end_90} :catchall_da
6647 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6648
6649      :cond_90
6650      :goto_90
6651 @@ -1412,8 +1351,8 @@
6652
6653      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6654      :try_end_9b
6655 -    .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6656 -    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6657 +    .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6658 +    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6659
6660      :cond_9b
6661      :goto_9b
6662 @@ -1428,8 +1367,8 @@
6663
6664      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6665      :try_end_a6
6666 -    .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6667 -    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6668 +    .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6669 +    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6670
6671      :cond_a6
6672      :goto_a6
6673 @@ -1444,8 +1383,8 @@
6674
6675      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6676      :try_end_b1
6677 -    .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6678 -    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6679 +    .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6680 +    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6681
6682      :cond_b1
6683      :goto_b1
6684 @@ -1464,15 +1403,15 @@
6685
6686      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6687      :try_end_c1
6688 -    .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6689 -    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6690 +    .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6691 +    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6692
6693      :cond_c1
6694      :goto_c1
6695      :try_start_c1
6696      monitor-exit v9
6697      :try_end_c2
6698 -    .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6699 +    .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6700
6701      :goto_c2
6702      return-void
6703 @@ -1488,13 +1427,11 @@
6704      :try_start_c8
6705      new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6706
6707 -    const/4 v8, 0x0
6708 -
6709 -    invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6710 -    :try_end_ce
6711 -    .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6712 +    invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6713 +    :try_end_cd
6714 +    .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6715
6716 -    :try_start_ce
6717 +    :try_start_cd
6718      iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6719
6720      iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6721 @@ -1507,133 +1444,133 @@
6722
6723      goto/16 :goto_23
6724
6725 -    :catchall_db
6726 +    :catchall_da
6727      move-exception v8
6728
6729 -    :goto_dc
6730 +    :goto_db
6731      monitor-exit v9
6732 -    :try_end_dd
6733 -    .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6734 +    :try_end_dc
6735 +    .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6736
6737      throw v8
6738
6739 -    :catch_de
6740 +    :catch_dd
6741      move-exception v2
6742
6743 -    :try_start_df
6744 +    :try_start_de
6745      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6746
6747 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6748 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6749
6750      goto/16 :goto_3c
6751
6752 -    :catch_e6
6753 +    :catch_e5
6754      move-exception v2
6755
6756      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6757
6758 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6759 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6760
6761      goto/16 :goto_50
6762
6763 -    :catch_ee
6764 +    :catch_ed
6765      move-exception v2
6766
6767      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6768
6769 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6770 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6771
6772      goto/16 :goto_5b
6773
6774 -    :catch_f6
6775 +    :catch_f5
6776      move-exception v2
6777
6778      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6779
6780 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6781 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6782
6783      goto/16 :goto_66
6784
6785 -    :catch_fe
6786 +    :catch_fd
6787      move-exception v2
6788
6789      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6790
6791 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6792 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6793
6794      goto/16 :goto_76
6795
6796 -    :catch_106
6797 +    :catch_105
6798      move-exception v2
6799
6800      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6801
6802 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6803 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6804
6805      goto/16 :goto_83
6806
6807 -    :catch_10e
6808 +    :catch_10d
6809      move-exception v2
6810
6811      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6812
6813 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6814 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6815
6816      goto/16 :goto_90
6817
6818 -    :catch_116
6819 +    :catch_115
6820      move-exception v2
6821
6822      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6823
6824 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6825 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6826
6827 -    goto/16 :goto_9b
6828 +    goto :goto_9b
6829
6830 -    :catch_11e
6831 +    :catch_11c
6832      move-exception v2
6833
6834      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6835
6836 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6837 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6838
6839      goto :goto_a6
6840
6841 -    :catch_125
6842 +    :catch_123
6843      move-exception v2
6844
6845      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6846
6847 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6848 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6849
6850      goto :goto_b1
6851
6852 -    :catch_12c
6853 +    :catch_12a
6854      move-exception v2
6855
6856      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6857
6858 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6859 -    :try_end_132
6860 -    .catchall {:try_start_df .. :try_end_132} :catchall_db
6861 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6862 +    :try_end_130
6863 +    .catchall {:try_start_de .. :try_end_130} :catchall_da
6864
6865      goto :goto_c1
6866
6867 -    :cond_133
6868 +    :cond_131
6869      invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6870
6871      move-result-object v8
6872
6873 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6874 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6875
6876      goto :goto_c2
6877
6878 -    :catchall_13b
6879 +    :catchall_139
6880      move-exception v8
6881
6882      move-object v5, v6
6883
6884 -    goto :goto_dc
6885 +    goto :goto_db
6886  .end method
6887
6888  .method public notifyCallForwardingChanged(Z)V
6889 @@ -1641,7 +1578,7 @@
6890
6891      const-string v3, "notifyCallForwardingChanged()"
6892
6893 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6894 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6895
6896      move-result v3
6897
6898 @@ -1719,7 +1656,7 @@
6899
6900      :cond_38
6901      :try_start_38
6902 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6903 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6904
6905      monitor-exit v4
6906      :try_end_3c
6907 @@ -1733,7 +1670,7 @@
6908
6909      const-string v3, "notifyCallState()"
6910
6911 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6912 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6913
6914      move-result v3
6915
6916 @@ -1813,7 +1750,7 @@
6917
6918      :cond_3a
6919      :try_start_3a
6920 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6921 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6922
6923      monitor-exit v4
6924      :try_end_3e
6925 @@ -1829,7 +1766,7 @@
6926
6927      const-string v3, "notifyCellInfo()"
6928
6929 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6930 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6931
6932      move-result v3
6933
6934 @@ -1911,7 +1848,7 @@
6935
6936      :cond_3d
6937      :try_start_3d
6938 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6939 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6940
6941      monitor-exit v4
6942      :try_end_41
6943 @@ -1925,7 +1862,7 @@
6944
6945      const-string v3, "notifyCellLocation()"
6946
6947 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6948 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6949
6950      move-result v3
6951
6952 @@ -2007,7 +1944,7 @@
6953
6954      :cond_3d
6955      :try_start_3d
6956 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6957 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6958
6959      monitor-exit v4
6960      :try_end_41
6961 @@ -2021,7 +1958,7 @@
6962
6963      const-string v3, "notifyDataActivity()"
6964
6965 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6966 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6967
6968      move-result v3
6969
6970 @@ -2099,7 +2036,7 @@
6971
6972      :cond_38
6973      :try_start_38
6974 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6975 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6976
6977      monitor-exit v4
6978      :try_end_3c
6979 @@ -2113,7 +2050,7 @@
6980
6981      const-string v1, "notifyDataConnection()"
6982
6983 -    invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6984 +    invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6985
6986      move-result v1
6987
6988 @@ -2281,7 +2218,7 @@
6989      goto :goto_28
6990
6991      :cond_89
6992 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6993 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6994
6995      :cond_8c
6996      monitor-exit v2
6997 @@ -2316,7 +2253,7 @@
6998
6999      const-string v0, "notifyDataConnectionFailed()"
7000
7001 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7002 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7003
7004      move-result v0
7005
7006 @@ -2336,7 +2273,7 @@
7007
7008      const-string v3, "notifyMessageWaitingChanged()"
7009
7010 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7011 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7012
7013      move-result v3
7014
7015 @@ -2414,7 +2351,7 @@
7016
7017      :cond_38
7018      :try_start_38
7019 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7020 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7021
7022      monitor-exit v4
7023      :try_end_3c
7024 @@ -2428,7 +2365,7 @@
7025
7026      const-string v3, "notifyOtaspChanged()"
7027
7028 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7029 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7030
7031      move-result v3
7032
7033 @@ -2506,7 +2443,7 @@
7034
7035      :cond_38
7036      :try_start_38
7037 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7038 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7039
7040      monitor-exit v4
7041      :try_end_3c
7042 @@ -2516,11 +2453,11 @@
7043  .end method
7044
7045  .method public notifyServiceState(Landroid/telephony/ServiceState;)V
7046 -    .registers 8
7047 +    .registers 10
7048
7049      const-string v3, "notifyServiceState()"
7050
7051 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7052 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7053
7054      move-result v3
7055
7056 @@ -2537,19 +2474,29 @@
7057      :try_start_c
7058      iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7059
7060 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7061 +
7062 +    const-string v5, ""
7063 +
7064 +    const-string v6, ""
7065 +
7066 +    const-string v7, ""
7067 +
7068 +    invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7069 +
7070      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7071
7072      invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
7073
7074      move-result-object v1
7075
7076 -    :cond_14
7077 -    :goto_14
7078 +    :cond_1f
7079 +    :goto_1f
7080      invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
7081
7082      move-result v3
7083
7084 -    if-eqz v3, :cond_3d
7085 +    if-eqz v3, :cond_51
7086
7087      invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
7088
7089 @@ -2558,14 +2505,22 @@
7090      check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7091
7092      iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
7093 -    :try_end_22
7094 -    .catchall {:try_start_c .. :try_end_22} :catchall_3a
7095 +    :try_end_2d
7096 +    .catchall {:try_start_c .. :try_end_2d} :catchall_4e
7097
7098      and-int/lit8 v3, v3, 0x1
7099
7100 -    if-eqz v3, :cond_14
7101 +    if-eqz v3, :cond_1f
7102 +
7103 +    :try_start_31
7104 +    const-string v3, ""
7105 +
7106 +    const-string v5, ""
7107 +
7108 +    const-string v6, ""
7109 +
7110 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7111
7112 -    :try_start_26
7113      iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
7114
7115      new-instance v5, Landroid/telephony/ServiceState;
7116 @@ -2573,42 +2528,42 @@
7117      invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
7118
7119      invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
7120 -    :try_end_30
7121 -    .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7122 -    .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7123 +    :try_end_44
7124 +    .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7125 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7126
7127 -    goto :goto_14
7128 +    goto :goto_1f
7129
7130 -    :catch_31
7131 +    :catch_45
7132      move-exception v0
7133
7134 -    :try_start_32
7135 +    :try_start_46
7136      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7137
7138      iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7139
7140      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7141
7142 -    goto :goto_14
7143 +    goto :goto_1f
7144
7145 -    :catchall_3a
7146 +    :catchall_4e
7147      move-exception v3
7148
7149      monitor-exit v4
7150 -    :try_end_3c
7151 -    .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7152 +    :try_end_50
7153 +    .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7154
7155      throw v3
7156
7157 -    :cond_3d
7158 -    :try_start_3d
7159 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7160 +    :cond_51
7161 +    :try_start_51
7162 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7163
7164      monitor-exit v4
7165 -    :try_end_41
7166 -    .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7167 +    :try_end_55
7168 +    .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7169
7170 -    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7171 +    invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7172
7173      goto :goto_8
7174  .end method
7175 @@ -2618,7 +2573,7 @@
7176
7177      const-string v4, "notifySignalStrength()"
7178
7179 -    invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7180 +    invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7181
7182      move-result v4
7183
7184 @@ -2741,7 +2696,7 @@
7185      goto :goto_30
7186
7187      :cond_5a
7188 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7189 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7190
7191      monitor-exit v5
7192      :try_end_5e
7193 @@ -2751,3 +2706,63 @@
7194
7195      goto :goto_8
7196  .end method
7197 +
7198 +.method protected remove(Landroid/os/IBinder;)V
7199 +    .registers 6
7200 +
7201 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7202 +
7203 +    monitor-enter v3
7204 +
7205 +    :try_start_3
7206 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7207 +
7208 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7209 +
7210 +    move-result v1
7211 +
7212 +    const/4 v0, 0x0
7213 +
7214 +    :goto_a
7215 +    if-ge v0, v1, :cond_22
7216 +
7217 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7218 +
7219 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7220 +
7221 +    move-result-object v2
7222 +
7223 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7224 +
7225 +    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7226 +
7227 +    if-ne v2, p1, :cond_1f
7228 +
7229 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7230 +
7231 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7232 +
7233 +    monitor-exit v3
7234 +
7235 +    :goto_1e
7236 +    return-void
7237 +
7238 +    :cond_1f
7239 +    add-int/lit8 v0, v0, 0x1
7240 +
7241 +    goto :goto_a
7242 +
7243 +    :cond_22
7244 +    monitor-exit v3
7245 +
7246 +    goto :goto_1e
7247 +
7248 +    :catchall_24
7249 +    move-exception v2
7250 +
7251 +    monitor-exit v3
7252 +    :try_end_26
7253 +    .catchall {:try_start_3 .. :try_end_26} :catchall_24
7254 +
7255 +    throw v2
7256 +.end method