patches/pd2.0/4.1/aosp-jb/20121017/services.patch

   1 diff -Npru stock-services/smali/com/android/server/am/BroadcastQueue.smali ext-services/smali/com/android/server/am/BroadcastQueue.smali
   2 --- stock-services/smali/com/android/server/am/BroadcastQueue.smali     2012-11-06 14:59:28.041120288 -0600
   3 +++ ext-services/smali/com/android/server/am/BroadcastQueue.smali       2012-11-06 14:59:14.729054274 -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 ext-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 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali      2012-11-06 14:59:13.373047558 -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 ext-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 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali        2012-11-06 14:59:13.397047670 -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 ext-services/smali/com/android/server/ServerThread.smali
3273 --- stock-services/smali/com/android/server/ServerThread.smali  2012-11-06 14:59:26.989115077 -0600
3274 +++ ext-services/smali/com/android/server/ServerThread.smali    2012-11-06 14:59:13.449047929 -0600
3275 @@ -24,6 +24,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 @@ -155,7 +190,7 @@
3318
3319      const/16 v9, 0x31
3320
3321 -    if-ne v3, v9, :cond_66f
3322 +    if-ne v3, v9, :cond_674
3323
3324      const/16 v93, 0x1
3325
3326 @@ -166,7 +201,7 @@
3327
3328      const/4 v9, 0x1
3329
3330 -    if-le v3, v9, :cond_673
3331 +    if-le v3, v9, :cond_678
3332
3333      const/4 v3, 0x1
3334
3335 @@ -202,7 +237,7 @@
3336
3337      move-result v3
3338
3339 -    if-eqz v3, :cond_677
3340 +    if-eqz v3, :cond_67c
3341
3342      const/16 v68, 0x0
3343
3344 @@ -302,7 +337,7 @@
3345
3346      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3347      :try_end_c0
3348 -    .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_9e7
3349 +    .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_9ec
3350
3351      :try_start_c0
3352      const-string v3, "power"
3353 @@ -327,9 +362,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 @@ -371,7 +406,7 @@
3366
3367      move-result v3
3368
3369 -    if-eqz v3, :cond_67d
3370 +    if-eqz v3, :cond_682
3371
3372      const-string v3, "SystemServer"
3373
3374 @@ -383,7 +418,7 @@
3375
3376      :cond_117
3377      :goto_117
3378 -    if-eqz v68, :cond_692
3379 +    if-eqz v68, :cond_697
3380
3381      const/4 v3, 0x1
3382
3383 @@ -392,7 +427,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_11f
3387 -    .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6a1
3388 +    .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6a6
3389
3390      move-result-object v90
3391
3392 @@ -401,8 +436,8 @@
3393      :try_start_122
3394      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3395      :try_end_125
3396 -    .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_97c
3397 -    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6a1
3398 +    .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_981
3399 +    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6a6
3400
3401      move-result v70
3402
3403 @@ -418,7 +453,7 @@
3404
3405      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3406      :try_end_131
3407 -    .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6a1
3408 +    .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6a6
3409
3410      :try_start_131
3411      const-string v3, "SystemServer"
3412 @@ -433,8 +468,8 @@
3413
3414      invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3415      :try_end_13f
3416 -    .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_695
3417 -    .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6a1
3418 +    .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_69a
3419 +    .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6a6
3420
3421      :try_start_13f
3422      const-string v3, "account"
3423 @@ -443,8 +478,8 @@
3424
3425      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3426      :try_end_146
3427 -    .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a26
3428 -    .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_9f0
3429 +    .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a2b
3430 +    .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_9f5
3431
3432      move-object/from16 v41, v42
3433
3434 @@ -460,7 +495,7 @@
3435
3436      move/from16 v0, v68
3437
3438 -    if-ne v0, v3, :cond_6b8
3439 +    if-ne v0, v3, :cond_6bd
3440
3441      const/4 v3, 0x1
3442
3443 @@ -469,6 +504,10 @@
3444
3445      move-result-object v57
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 @@ -488,10 +527,10 @@
3455      move-object/from16 v0, v75
3456
3457      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3458 -    :try_end_171
3459 -    .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_171} :catch_6a1
3460 +    :try_end_176
3461 +    .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_176} :catch_6a6
3462
3463 -    :try_start_171
3464 +    :try_start_176
3465      const-string v3, "SystemServer"
3466
3467      const-string v9, "Battery Service"
3468 @@ -503,10 +542,10 @@
3469      move-object/from16 v0, v75
3470
3471      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3472 -    :try_end_17f
3473 -    .catch Ljava/lang/RuntimeException; {:try_start_171 .. :try_end_17f} :catch_9f9
3474 +    :try_end_184
3475 +    .catch Ljava/lang/RuntimeException; {:try_start_176 .. :try_end_184} :catch_9fe
3476
3477 -    :try_start_17f
3478 +    :try_start_184
3479      const-string v3, "battery"
3480
3481      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3482 @@ -522,10 +561,10 @@
3483      move-object/from16 v0, v111
3484
3485      invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3486 -    :try_end_192
3487 -    .catch Ljava/lang/RuntimeException; {:try_start_17f .. :try_end_192} :catch_a02
3488 +    :try_end_197
3489 +    .catch Ljava/lang/RuntimeException; {:try_start_184 .. :try_end_197} :catch_a07
3490
3491 -    :try_start_192
3492 +    :try_start_197
3493      const-string v3, "vibrator"
3494
3495      move-object/from16 v0, v111
3496 @@ -549,10 +588,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_1ae
3501 -    .catch Ljava/lang/RuntimeException; {:try_start_192 .. :try_end_1ae} :catch_a09
3502 +    :try_end_1b3
3503 +    .catch Ljava/lang/RuntimeException; {:try_start_197 .. :try_end_1b3} :catch_a0e
3504
3505 -    :try_start_1ae
3506 +    :try_start_1b3
3507      const-string v3, "alarm"
3508
3509      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3510 @@ -583,18 +622,18 @@
3511
3512      move/from16 v0, v68
3513
3514 -    if-eq v0, v3, :cond_6bb
3515 +    if-eq v0, v3, :cond_6c0
3516
3517      const/4 v3, 0x1
3518
3519      move v9, v3
3520
3521 -    :goto_1d3
3522 -    if-nez v70, :cond_6bf
3523 +    :goto_1d8
3524 +    if-nez v70, :cond_6c4
3525
3526      const/4 v3, 0x1
3527
3528 -    :goto_1d6
3529 +    :goto_1db
3530      move/from16 v0, v89
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 @@ -637,22 +676,22 @@
3534
3535      move-result v3
3536
3537 -    if-eqz v3, :cond_6c2
3538 +    if-eqz v3, :cond_6c7
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_20c
3546 -    .catch Ljava/lang/RuntimeException; {:try_start_1ae .. :try_end_20c} :catch_6d0
3547 +    :try_end_211
3548 +    .catch Ljava/lang/RuntimeException; {:try_start_1b3 .. :try_end_211} :catch_6d5
3549
3550 -    :goto_20c
3551 +    :goto_211
3552      move-object/from16 v110, v111
3553
3554      move-object/from16 v74, v75
3555
3556 -    :goto_210
3557 +    :goto_215
3558      const/16 v61, 0x0
3559
3560      const/16 v100, 0x0
3561 @@ -679,9 +718,9 @@
3562
3563      move/from16 v0, v68
3564
3565 -    if-eq v0, v3, :cond_255
3566 +    if-eq v0, v3, :cond_25a
3567
3568 -    :try_start_22b
3569 +    :try_start_230
3570      const-string v3, "SystemServer"
3571
3572      const-string v9, "Input Method Service"
3573 @@ -695,22 +734,22 @@
3574      move-object/from16 v1, v119
3575
3576      invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3577 -    :try_end_23b
3578 -    .catch Ljava/lang/Throwable; {:try_start_22b .. :try_end_23b} :catch_725
3579 +    :try_end_240
3580 +    .catch Ljava/lang/Throwable; {:try_start_230 .. :try_end_240} :catch_72a
3581
3582 -    :try_start_23b
3583 +    :try_start_240
3584      const-string v3, "input_method"
3585
3586      move-object/from16 v0, v72
3587
3588      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3589 -    :try_end_242
3590 -    .catch Ljava/lang/Throwable; {:try_start_23b .. :try_end_242} :catch_9e2
3591 +    :try_end_247
3592 +    .catch Ljava/lang/Throwable; {:try_start_240 .. :try_end_247} :catch_9e7
3593
3594      move-object/from16 v71, v72
3595
3596 -    :goto_244
3597 -    :try_start_244
3598 +    :goto_249
3599 +    :try_start_249
3600      const-string v3, "SystemServer"
3601
3602      const-string v9, "Accessibility Manager"
3603 @@ -724,24 +763,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_255
3608 -    .catch Ljava/lang/Throwable; {:try_start_244 .. :try_end_255} :catch_731
3609 +    :try_end_25a
3610 +    .catch Ljava/lang/Throwable; {:try_start_249 .. :try_end_25a} :catch_736
3611
3612 -    :cond_255
3613 -    :goto_255
3614 -    :try_start_255
3615 +    :cond_25a
3616 +    :goto_25a
3617 +    :try_start_25a
3618      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3619 -    :try_end_258
3620 -    .catch Ljava/lang/Throwable; {:try_start_255 .. :try_end_258} :catch_73d
3621 +    :try_end_25d
3622 +    .catch Ljava/lang/Throwable; {:try_start_25a .. :try_end_25d} :catch_742
3623
3624 -    :goto_258
3625 -    :try_start_258
3626 +    :goto_25d
3627 +    :try_start_25d
3628      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3629 -    :try_end_25b
3630 -    .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_25b} :catch_749
3631 +    :try_end_260
3632 +    .catch Ljava/lang/Throwable; {:try_start_25d .. :try_end_260} :catch_74e
3633
3634 -    :goto_25b
3635 -    :try_start_25b
3636 +    :goto_260
3637 +    :try_start_260
3638      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3639
3640      move-result-object v3
3641 @@ -759,15 +798,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_26e
3646 -    .catch Landroid/os/RemoteException; {:try_start_25b .. :try_end_26e} :catch_9df
3647 +    :try_end_273
3648 +    .catch Landroid/os/RemoteException; {:try_start_260 .. :try_end_273} :catch_9e4
3649
3650 -    :goto_26e
3651 +    :goto_273
3652      const/4 v3, 0x1
3653
3654      move/from16 v0, v68
3655
3656 -    if-eq v0, v3, :cond_a2b
3657 +    if-eq v0, v3, :cond_a30
3658
3659      const/16 v81, 0x0
3660
3661 @@ -783,9 +822,9 @@
3662
3663      move-result v3
3664
3665 -    if-nez v3, :cond_29a
3666 +    if-nez v3, :cond_29f
3667
3668 -    :try_start_283
3669 +    :try_start_288
3670      const-string v3, "SystemServer"
3671
3672      const-string v9, "Mount Service"
3673 @@ -797,23 +836,23 @@
3674      move-object/from16 v0, v82
3675
3676      invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3677 -    :try_end_291
3678 -    .catch Ljava/lang/Throwable; {:try_start_283 .. :try_end_291} :catch_755
3679 +    :try_end_296
3680 +    .catch Ljava/lang/Throwable; {:try_start_288 .. :try_end_296} :catch_75a
3681
3682 -    :try_start_291
3683 +    :try_start_296
3684      const-string v3, "mount"
3685
3686      move-object/from16 v0, v82
3687
3688      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3689 -    :try_end_298
3690 -    .catch Ljava/lang/Throwable; {:try_start_291 .. :try_end_298} :catch_9da
3691 +    :try_end_29d
3692 +    .catch Ljava/lang/Throwable; {:try_start_296 .. :try_end_29d} :catch_9df
3693
3694      move-object/from16 v81, v82
3695
3696 -    :cond_29a
3697 -    :goto_29a
3698 -    :try_start_29a
3699 +    :cond_29f
3700 +    :goto_29f
3701 +    :try_start_29f
3702      const-string v3, "SystemServer"
3703
3704      const-string v9, "LockSettingsService"
3705 @@ -825,22 +864,22 @@
3706      move-object/from16 v0, v79
3707
3708      invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3709 -    :try_end_2a8
3710 -    .catch Ljava/lang/Throwable; {:try_start_29a .. :try_end_2a8} :catch_761
3711 +    :try_end_2ad
3712 +    .catch Ljava/lang/Throwable; {:try_start_29f .. :try_end_2ad} :catch_766
3713
3714 -    :try_start_2a8
3715 +    :try_start_2ad
3716      const-string v3, "lock_settings"
3717
3718      move-object/from16 v0, v79
3719
3720      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3721 -    :try_end_2af
3722 -    .catch Ljava/lang/Throwable; {:try_start_2a8 .. :try_end_2af} :catch_9d5
3723 +    :try_end_2b4
3724 +    .catch Ljava/lang/Throwable; {:try_start_2ad .. :try_end_2b4} :catch_9da
3725
3726      move-object/from16 v78, v79
3727
3728 -    :goto_2b1
3729 -    :try_start_2b1
3730 +    :goto_2b6
3731 +    :try_start_2b6
3732      const-string v3, "SystemServer"
3733
3734      const-string v9, "Device Policy"
3735 @@ -852,22 +891,22 @@
3736      move-object/from16 v0, v62
3737
3738      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3739 -    :try_end_2bf
3740 -    .catch Ljava/lang/Throwable; {:try_start_2b1 .. :try_end_2bf} :catch_76d
3741 +    :try_end_2c4
3742 +    .catch Ljava/lang/Throwable; {:try_start_2b6 .. :try_end_2c4} :catch_772
3743
3744 -    :try_start_2bf
3745 +    :try_start_2c4
3746      const-string v3, "device_policy"
3747
3748      move-object/from16 v0, v62
3749
3750      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3751 -    :try_end_2c6
3752 -    .catch Ljava/lang/Throwable; {:try_start_2bf .. :try_end_2c6} :catch_9d0
3753 +    :try_end_2cb
3754 +    .catch Ljava/lang/Throwable; {:try_start_2c4 .. :try_end_2cb} :catch_9d5
3755
3756      move-object/from16 v61, v62
3757
3758 -    :goto_2c8
3759 -    :try_start_2c8
3760 +    :goto_2cd
3761 +    :try_start_2cd
3762      const-string v3, "SystemServer"
3763
3764      const-string v9, "Status Bar"
3765 @@ -881,22 +920,22 @@
3766      move-object/from16 v1, v119
3767
3768      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3769 -    :try_end_2d8
3770 -    .catch Ljava/lang/Throwable; {:try_start_2c8 .. :try_end_2d8} :catch_779
3771 +    :try_end_2dd
3772 +    .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2dd} :catch_77e
3773
3774 -    :try_start_2d8
3775 +    :try_start_2dd
3776      const-string v3, "statusbar"
3777
3778      move-object/from16 v0, v101
3779
3780      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3781 -    :try_end_2df
3782 -    .catch Ljava/lang/Throwable; {:try_start_2d8 .. :try_end_2df} :catch_9cb
3783 +    :try_end_2e4
3784 +    .catch Ljava/lang/Throwable; {:try_start_2dd .. :try_end_2e4} :catch_9d0
3785
3786      move-object/from16 v100, v101
3787
3788 -    :goto_2e1
3789 -    :try_start_2e1
3790 +    :goto_2e6
3791 +    :try_start_2e6
3792      const-string v3, "SystemServer"
3793
3794      const-string v9, "Clipboard Service"
3795 @@ -910,11 +949,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_2f2
3800 -    .catch Ljava/lang/Throwable; {:try_start_2e1 .. :try_end_2f2} :catch_785
3801 +    :try_end_2f7
3802 +    .catch Ljava/lang/Throwable; {:try_start_2e6 .. :try_end_2f7} :catch_78a
3803
3804 -    :goto_2f2
3805 -    :try_start_2f2
3806 +    :goto_2f7
3807 +    :try_start_2f7
3808      const-string v3, "SystemServer"
3809
3810      const-string v9, "NetworkManagement Service"
3811 @@ -928,11 +967,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_302
3816 -    .catch Ljava/lang/Throwable; {:try_start_2f2 .. :try_end_302} :catch_791
3817 +    :try_end_307
3818 +    .catch Ljava/lang/Throwable; {:try_start_2f7 .. :try_end_307} :catch_796
3819
3820 -    :goto_302
3821 -    :try_start_302
3822 +    :goto_307
3823 +    :try_start_307
3824      const-string v3, "SystemServer"
3825
3826      const-string v9, "Text Service Manager Service"
3827 @@ -944,22 +983,22 @@
3828      move-object/from16 v0, v105
3829
3830      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3831 -    :try_end_310
3832 -    .catch Ljava/lang/Throwable; {:try_start_302 .. :try_end_310} :catch_79d
3833 +    :try_end_315
3834 +    .catch Ljava/lang/Throwable; {:try_start_307 .. :try_end_315} :catch_7a2
3835
3836 -    :try_start_310
3837 +    :try_start_315
3838      const-string v3, "textservices"
3839
3840      move-object/from16 v0, v105
3841
3842      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3843 -    :try_end_317
3844 -    .catch Ljava/lang/Throwable; {:try_start_310 .. :try_end_317} :catch_9c6
3845 +    :try_end_31c
3846 +    .catch Ljava/lang/Throwable; {:try_start_315 .. :try_end_31c} :catch_9cb
3847
3848      move-object/from16 v104, v105
3849
3850 -    :goto_319
3851 -    :try_start_319
3852 +    :goto_31e
3853 +    :try_start_31e
3854      const-string v3, "SystemServer"
3855
3856      const-string v9, "NetworkStats Service"
3857 @@ -971,22 +1010,22 @@
3858      move-object/from16 v0, v84
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_327
3862 -    .catch Ljava/lang/Throwable; {:try_start_319 .. :try_end_327} :catch_7a9
3863 +    :try_end_32c
3864 +    .catch Ljava/lang/Throwable; {:try_start_31e .. :try_end_32c} :catch_7ae
3865
3866 -    :try_start_327
3867 +    :try_start_32c
3868      const-string v3, "netstats"
3869
3870      move-object/from16 v0, v84
3871
3872      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3873 -    :try_end_32e
3874 -    .catch Ljava/lang/Throwable; {:try_start_327 .. :try_end_32e} :catch_9c1
3875 +    :try_end_333
3876 +    .catch Ljava/lang/Throwable; {:try_start_32c .. :try_end_333} :catch_9c6
3877
3878      move-object/from16 v12, v84
3879
3880 -    :goto_330
3881 -    :try_start_330
3882 +    :goto_335
3883 +    :try_start_335
3884      const-string v3, "SystemServer"
3885
3886      const-string v9, "NetworkPolicy Service"
3887 @@ -1004,18 +1043,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_342
3892 -    .catch Ljava/lang/Throwable; {:try_start_330 .. :try_end_342} :catch_7b5
3893 +    :try_end_347
3894 +    .catch Ljava/lang/Throwable; {:try_start_335 .. :try_end_347} :catch_7ba
3895
3896 -    :try_start_342
3897 +    :try_start_347
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_347
3902 -    .catch Ljava/lang/Throwable; {:try_start_342 .. :try_end_347} :catch_9be
3903 +    :try_end_34c
3904 +    .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_34c} :catch_9c3
3905
3906 -    :goto_347
3907 -    :try_start_347
3908 +    :goto_34c
3909 +    :try_start_34c
3910      const-string v3, "SystemServer"
3911
3912      const-string v9, "Wi-Fi P2pService"
3913 @@ -1027,22 +1066,22 @@
3914      move-object/from16 v0, v118
3915
3916      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3917 -    :try_end_355
3918 -    .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_355} :catch_7c3
3919 +    :try_end_35a
3920 +    .catch Ljava/lang/Throwable; {:try_start_34c .. :try_end_35a} :catch_7c8
3921
3922 -    :try_start_355
3923 +    :try_start_35a
3924      const-string v3, "wifip2p"
3925
3926      move-object/from16 v0, v118
3927
3928      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3929 -    :try_end_35c
3930 -    .catch Ljava/lang/Throwable; {:try_start_355 .. :try_end_35c} :catch_9b9
3931 +    :try_end_361
3932 +    .catch Ljava/lang/Throwable; {:try_start_35a .. :try_end_361} :catch_9be
3933
3934      move-object/from16 v117, v118
3935
3936 -    :goto_35e
3937 -    :try_start_35e
3938 +    :goto_363
3939 +    :try_start_363
3940      const-string v3, "SystemServer"
3941
3942      const-string v9, "Wi-Fi Service"
3943 @@ -1054,22 +1093,22 @@
3944      move-object/from16 v0, v116
3945
3946      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3947 -    :try_end_36c
3948 -    .catch Ljava/lang/Throwable; {:try_start_35e .. :try_end_36c} :catch_7cf
3949 +    :try_end_371
3950 +    .catch Ljava/lang/Throwable; {:try_start_363 .. :try_end_371} :catch_7d4
3951
3952 -    :try_start_36c
3953 +    :try_start_371
3954      const-string v3, "wifi"
3955
3956      move-object/from16 v0, v116
3957
3958      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3959 -    :try_end_373
3960 -    .catch Ljava/lang/Throwable; {:try_start_36c .. :try_end_373} :catch_9b4
3961 +    :try_end_378
3962 +    .catch Ljava/lang/Throwable; {:try_start_371 .. :try_end_378} :catch_9b9
3963
3964      move-object/from16 v115, v116
3965
3966 -    :goto_375
3967 -    :try_start_375
3968 +    :goto_37a
3969 +    :try_start_37a
3970      const-string v3, "SystemServer"
3971
3972      const-string v9, "Connectivity Service"
3973 @@ -1081,10 +1120,10 @@
3974      move-object/from16 v0, v56
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_383
3978 -    .catch Ljava/lang/Throwable; {:try_start_375 .. :try_end_383} :catch_7db
3979 +    :try_end_388
3980 +    .catch Ljava/lang/Throwable; {:try_start_37a .. :try_end_388} :catch_7e0
3981
3982 -    :try_start_383
3983 +    :try_start_388
3984      const-string v3, "connectivity"
3985
3986      move-object/from16 v0, v56
3987 @@ -1102,13 +1141,13 @@
3988      invoke-virtual/range {v115 .. v115}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3989
3990      invoke-virtual/range {v117 .. v117}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3991 -    :try_end_39a
3992 -    .catch Ljava/lang/Throwable; {:try_start_383 .. :try_end_39a} :catch_9af
3993 +    :try_end_39f
3994 +    .catch Ljava/lang/Throwable; {:try_start_388 .. :try_end_39f} :catch_9b4
3995
3996      move-object/from16 v55, v56
3997
3998 -    :goto_39c
3999 -    :try_start_39c
4000 +    :goto_3a1
4001 +    :try_start_3a1
4002      const-string v3, "SystemServer"
4003
4004      const-string v9, "Network Service Discovery Service"
4005 @@ -1124,11 +1163,11 @@
4006      move-object/from16 v0, v98
4007
4008      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4009 -    :try_end_3ae
4010 -    .catch Ljava/lang/Throwable; {:try_start_39c .. :try_end_3ae} :catch_7e7
4011 +    :try_end_3b3
4012 +    .catch Ljava/lang/Throwable; {:try_start_3a1 .. :try_end_3b3} :catch_7ec
4013
4014 -    :goto_3ae
4015 -    :try_start_3ae
4016 +    :goto_3b3
4017 +    :try_start_3b3
4018      const-string v3, "SystemServer"
4019
4020      const-string v9, "Throttle Service"
4021 @@ -1140,22 +1179,22 @@
4022      move-object/from16 v0, v103
4023
4024      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4025 -    :try_end_3bc
4026 -    .catch Ljava/lang/Throwable; {:try_start_3ae .. :try_end_3bc} :catch_7f3
4027 +    :try_end_3c1
4028 +    .catch Ljava/lang/Throwable; {:try_start_3b3 .. :try_end_3c1} :catch_7f8
4029
4030 -    :try_start_3bc
4031 +    :try_start_3c1
4032      const-string v3, "throttle"
4033
4034      move-object/from16 v0, v103
4035
4036      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4037 -    :try_end_3c3
4038 -    .catch Ljava/lang/Throwable; {:try_start_3bc .. :try_end_3c3} :catch_9aa
4039 +    :try_end_3c8
4040 +    .catch Ljava/lang/Throwable; {:try_start_3c1 .. :try_end_3c8} :catch_9af
4041
4042      move-object/from16 v102, v103
4043
4044 -    :goto_3c5
4045 -    :try_start_3c5
4046 +    :goto_3ca
4047 +    :try_start_3ca
4048      const-string v3, "SystemServer"
4049
4050      const-string v9, "UpdateLock Service"
4051 @@ -1169,34 +1208,34 @@
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_3d6
4056 -    .catch Ljava/lang/Throwable; {:try_start_3c5 .. :try_end_3d6} :catch_7ff
4057 +    :try_end_3db
4058 +    .catch Ljava/lang/Throwable; {:try_start_3ca .. :try_end_3db} :catch_804
4059
4060 -    :goto_3d6
4061 -    if-eqz v81, :cond_3db
4062 +    :goto_3db
4063 +    if-eqz v81, :cond_3e0
4064
4065      invoke-virtual/range {v81 .. v81}, Lcom/android/server/MountService;->waitForAsecScan()V
4066
4067 -    :cond_3db
4068 -    if-eqz v41, :cond_3e0
4069 -
4070 -    :try_start_3dd
4071 -    invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4072 -    :try_end_3e0
4073 -    .catch Ljava/lang/Throwable; {:try_start_3dd .. :try_end_3e0} :catch_80b
4074 -
4075      :cond_3e0
4076 -    :goto_3e0
4077 -    if-eqz v57, :cond_3e5
4078 +    if-eqz v41, :cond_3e5
4079
4080      :try_start_3e2
4081 -    invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4082 +    invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4083      :try_end_3e5
4084 -    .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_817
4085 +    .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_810
4086
4087      :cond_3e5
4088      :goto_3e5
4089 -    :try_start_3e5
4090 +    if-eqz v57, :cond_3ea
4091 +
4092 +    :try_start_3e7
4093 +    invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4094 +    :try_end_3ea
4095 +    .catch Ljava/lang/Throwable; {:try_start_3e7 .. :try_end_3ea} :catch_81c
4096 +
4097 +    :cond_3ea
4098 +    :goto_3ea
4099 +    :try_start_3ea
4100      const-string v3, "SystemServer"
4101
4102      const-string v9, "Notification Manager"
4103 @@ -1212,10 +1251,10 @@
4104      move-object/from16 v2, v74
4105
4106      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4107 -    :try_end_3f7
4108 -    .catch Ljava/lang/Throwable; {:try_start_3e5 .. :try_end_3f7} :catch_823
4109 +    :try_end_3fc
4110 +    .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3fc} :catch_828
4111
4112 -    :try_start_3f7
4113 +    :try_start_3fc
4114      const-string v3, "notification"
4115
4116      move-object/from16 v0, v88
4117 @@ -1225,13 +1264,13 @@
4118      move-object/from16 v0, v88
4119
4120      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4121 -    :try_end_403
4122 -    .catch Ljava/lang/Throwable; {:try_start_3f7 .. :try_end_403} :catch_9a5
4123 +    :try_end_408
4124 +    .catch Ljava/lang/Throwable; {:try_start_3fc .. :try_end_408} :catch_9aa
4125
4126      move-object/from16 v87, v88
4127
4128 -    :goto_405
4129 -    :try_start_405
4130 +    :goto_40a
4131 +    :try_start_40a
4132      const-string v3, "SystemServer"
4133
4134      const-string v9, "Device Storage Monitor"
4135 @@ -1245,11 +1284,11 @@
4136      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4137
4138      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4139 -    :try_end_416
4140 -    .catch Ljava/lang/Throwable; {:try_start_405 .. :try_end_416} :catch_82f
4141 +    :try_end_41b
4142 +    .catch Ljava/lang/Throwable; {:try_start_40a .. :try_end_41b} :catch_834
4143
4144 -    :goto_416
4145 -    :try_start_416
4146 +    :goto_41b
4147 +    :try_start_41b
4148      const-string v3, "SystemServer"
4149
4150      const-string v9, "Location Manager"
4151 @@ -1261,22 +1300,22 @@
4152      move-object/from16 v0, v77
4153
4154      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4155 -    :try_end_424
4156 -    .catch Ljava/lang/Throwable; {:try_start_416 .. :try_end_424} :catch_83b
4157 +    :try_end_429
4158 +    .catch Ljava/lang/Throwable; {:try_start_41b .. :try_end_429} :catch_840
4159
4160 -    :try_start_424
4161 +    :try_start_429
4162      const-string v3, "location"
4163
4164      move-object/from16 v0, v77
4165
4166      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4167 -    :try_end_42b
4168 -    .catch Ljava/lang/Throwable; {:try_start_424 .. :try_end_42b} :catch_9a0
4169 +    :try_end_430
4170 +    .catch Ljava/lang/Throwable; {:try_start_429 .. :try_end_430} :catch_9a5
4171
4172      move-object/from16 v76, v77
4173
4174 -    :goto_42d
4175 -    :try_start_42d
4176 +    :goto_432
4177 +    :try_start_432
4178      const-string v3, "SystemServer"
4179
4180      const-string v9, "Country Detector"
4181 @@ -1288,22 +1327,22 @@
4182      move-object/from16 v0, v59
4183
4184      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4185 -    :try_end_43b
4186 -    .catch Ljava/lang/Throwable; {:try_start_42d .. :try_end_43b} :catch_847
4187 +    :try_end_440
4188 +    .catch Ljava/lang/Throwable; {:try_start_432 .. :try_end_440} :catch_84c
4189
4190 -    :try_start_43b
4191 +    :try_start_440
4192      const-string v3, "country_detector"
4193
4194      move-object/from16 v0, v59
4195
4196      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4197 -    :try_end_442
4198 -    .catch Ljava/lang/Throwable; {:try_start_43b .. :try_end_442} :catch_99b
4199 +    :try_end_447
4200 +    .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_447} :catch_9a0
4201
4202      move-object/from16 v58, v59
4203
4204 -    :goto_444
4205 -    :try_start_444
4206 +    :goto_449
4207 +    :try_start_449
4208      const-string v3, "SystemServer"
4209
4210      const-string v9, "Search Service"
4211 @@ -1317,11 +1356,11 @@
4212      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4213
4214      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4215 -    :try_end_455
4216 -    .catch Ljava/lang/Throwable; {:try_start_444 .. :try_end_455} :catch_853
4217 +    :try_end_45a
4218 +    .catch Ljava/lang/Throwable; {:try_start_449 .. :try_end_45a} :catch_858
4219
4220 -    :goto_455
4221 -    :try_start_455
4222 +    :goto_45a
4223 +    :try_start_45a
4224      const-string v3, "SystemServer"
4225
4226      const-string v9, "DropBox Service"
4227 @@ -1341,10 +1380,10 @@
4228      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4229
4230      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4231 -    :try_end_46d
4232 -    .catch Ljava/lang/Throwable; {:try_start_455 .. :try_end_46d} :catch_85f
4233 +    :try_end_472
4234 +    .catch Ljava/lang/Throwable; {:try_start_45a .. :try_end_472} :catch_864
4235
4236 -    :goto_46d
4237 +    :goto_472
4238      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4239
4240      move-result-object v3
4241 @@ -1355,38 +1394,38 @@
4242
4243      move-result v3
4244
4245 -    if-eqz v3, :cond_493
4246 +    if-eqz v3, :cond_498
4247
4248 -    :try_start_47a
4249 +    :try_start_47f
4250      const-string v3, "SystemServer"
4251
4252      const-string v9, "Wallpaper Service"
4253
4254      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4255
4256 -    if-nez v16, :cond_493
4257 +    if-nez v16, :cond_498
4258
4259      new-instance v114, Lcom/android/server/WallpaperManagerService;
4260
4261      move-object/from16 v0, v114
4262
4263      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4264 -    :try_end_48a
4265 -    .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_48a} :catch_86b
4266 +    :try_end_48f
4267 +    .catch Ljava/lang/Throwable; {:try_start_47f .. :try_end_48f} :catch_870
4268
4269 -    :try_start_48a
4270 +    :try_start_48f
4271      const-string v3, "wallpaper"
4272
4273      move-object/from16 v0, v114
4274
4275      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4276 -    :try_end_491
4277 -    .catch Ljava/lang/Throwable; {:try_start_48a .. :try_end_491} :catch_996
4278 +    :try_end_496
4279 +    .catch Ljava/lang/Throwable; {:try_start_48f .. :try_end_496} :catch_99b
4280
4281      move-object/from16 v113, v114
4282
4283 -    :cond_493
4284 -    :goto_493
4285 +    :cond_498
4286 +    :goto_498
4287      const-string v3, "0"
4288
4289      const-string v9, "system_init.startaudioservice"
4290 @@ -1399,9 +1438,9 @@
4291
4292      move-result v3
4293
4294 -    if-nez v3, :cond_4b2
4295 +    if-nez v3, :cond_4b7
4296
4297 -    :try_start_4a1
4298 +    :try_start_4a6
4299      const-string v3, "SystemServer"
4300
4301      const-string v9, "Audio Service"
4302 @@ -1415,12 +1454,12 @@
4303      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4304
4305      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4306 -    :try_end_4b2
4307 -    .catch Ljava/lang/Throwable; {:try_start_4a1 .. :try_end_4b2} :catch_877
4308 +    :try_end_4b7
4309 +    .catch Ljava/lang/Throwable; {:try_start_4a6 .. :try_end_4b7} :catch_87c
4310
4311 -    :cond_4b2
4312 -    :goto_4b2
4313 -    :try_start_4b2
4314 +    :cond_4b7
4315 +    :goto_4b7
4316 +    :try_start_4b7
4317      const-string v3, "SystemServer"
4318
4319      const-string v9, "Dock Observer"
4320 @@ -1432,13 +1471,13 @@
4321      move-object/from16 v0, v64
4322
4323      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4324 -    :try_end_4c0
4325 -    .catch Ljava/lang/Throwable; {:try_start_4b2 .. :try_end_4c0} :catch_883
4326 +    :try_end_4c5
4327 +    .catch Ljava/lang/Throwable; {:try_start_4b7 .. :try_end_4c5} :catch_888
4328
4329      move-object/from16 v63, v64
4330
4331 -    :goto_4c2
4332 -    :try_start_4c2
4333 +    :goto_4c7
4334 +    :try_start_4c7
4335      const-string v3, "SystemServer"
4336
4337      const-string v9, "Wired Accessory Observer"
4338 @@ -1448,11 +1487,11 @@
4339      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4340
4341      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4342 -    :try_end_4ce
4343 -    .catch Ljava/lang/Throwable; {:try_start_4c2 .. :try_end_4ce} :catch_88f
4344 +    :try_end_4d3
4345 +    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d3} :catch_894
4346
4347 -    :goto_4ce
4348 -    :try_start_4ce
4349 +    :goto_4d3
4350 +    :try_start_4d3
4351      const-string v3, "SystemServer"
4352
4353      const-string v9, "USB Service"
4354 @@ -1464,22 +1503,22 @@
4355      move-object/from16 v0, v109
4356
4357      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4358 -    :try_end_4dc
4359 -    .catch Ljava/lang/Throwable; {:try_start_4ce .. :try_end_4dc} :catch_89b
4360 +    :try_end_4e1
4361 +    .catch Ljava/lang/Throwable; {:try_start_4d3 .. :try_end_4e1} :catch_8a0
4362
4363 -    :try_start_4dc
4364 +    :try_start_4e1
4365      const-string v3, "usb"
4366
4367      move-object/from16 v0, v109
4368
4369      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4370 -    :try_end_4e3
4371 -    .catch Ljava/lang/Throwable; {:try_start_4dc .. :try_end_4e3} :catch_991
4372 +    :try_end_4e8
4373 +    .catch Ljava/lang/Throwable; {:try_start_4e1 .. :try_end_4e8} :catch_996
4374
4375      move-object/from16 v108, v109
4376
4377 -    :goto_4e5
4378 -    :try_start_4e5
4379 +    :goto_4ea
4380 +    :try_start_4ea
4381      const-string v3, "SystemServer"
4382
4383      const-string v9, "Serial Service"
4384 @@ -1491,22 +1530,22 @@
4385      move-object/from16 v0, v97
4386
4387      invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4388 -    :try_end_4f3
4389 -    .catch Ljava/lang/Throwable; {:try_start_4e5 .. :try_end_4f3} :catch_8a7
4390 +    :try_end_4f8
4391 +    .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_8ac
4392
4393 -    :try_start_4f3
4394 +    :try_start_4f8
4395      const-string v3, "serial"
4396
4397      move-object/from16 v0, v97
4398
4399      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4400 -    :try_end_4fa
4401 -    .catch Ljava/lang/Throwable; {:try_start_4f3 .. :try_end_4fa} :catch_98c
4402 +    :try_end_4ff
4403 +    .catch Ljava/lang/Throwable; {:try_start_4f8 .. :try_end_4ff} :catch_991
4404
4405      move-object/from16 v96, v97
4406
4407 -    :goto_4fc
4408 -    :try_start_4fc
4409 +    :goto_501
4410 +    :try_start_501
4411      const-string v3, "SystemServer"
4412
4413      const-string v9, "UI Mode Manager Service"
4414 @@ -1518,13 +1557,13 @@
4415      move-object/from16 v0, v107
4416
4417      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4418 -    :try_end_50a
4419 -    .catch Ljava/lang/Throwable; {:try_start_4fc .. :try_end_50a} :catch_8b3
4420 +    :try_end_50f
4421 +    .catch Ljava/lang/Throwable; {:try_start_501 .. :try_end_50f} :catch_8b8
4422
4423      move-object/from16 v106, v107
4424
4425 -    :goto_50c
4426 -    :try_start_50c
4427 +    :goto_511
4428 +    :try_start_511
4429      const-string v3, "SystemServer"
4430
4431      const-string v9, "Backup Service"
4432 @@ -1538,11 +1577,11 @@
4433      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4434
4435      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4436 -    :try_end_51d
4437 -    .catch Ljava/lang/Throwable; {:try_start_50c .. :try_end_51d} :catch_8bf
4438 +    :try_end_522
4439 +    .catch Ljava/lang/Throwable; {:try_start_511 .. :try_end_522} :catch_8c4
4440
4441 -    :goto_51d
4442 -    :try_start_51d
4443 +    :goto_522
4444 +    :try_start_522
4445      const-string v3, "SystemServer"
4446
4447      const-string v9, "AppWidget Service"
4448 @@ -1554,22 +1593,22 @@
4449      move-object/from16 v0, v45
4450
4451      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4452 -    :try_end_52b
4453 -    .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_8cb
4454 +    :try_end_530
4455 +    .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_8d0
4456
4457 -    :try_start_52b
4458 +    :try_start_530
4459      const-string v3, "appwidget"
4460
4461      move-object/from16 v0, v45
4462
4463      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4464 -    :try_end_532
4465 -    .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_987
4466 +    :try_end_537
4467 +    .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_98c
4468
4469      move-object/from16 v44, v45
4470
4471 -    :goto_534
4472 -    :try_start_534
4473 +    :goto_539
4474 +    :try_start_539
4475      const-string v3, "SystemServer"
4476
4477      const-string v9, "Recognition Service"
4478 @@ -1581,13 +1620,13 @@
4479      move-object/from16 v0, v95
4480
4481      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4482 -    :try_end_542
4483 -    .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_8d7
4484 +    :try_end_547
4485 +    .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_8dc
4486
4487      move-object/from16 v94, v95
4488
4489 -    :goto_544
4490 -    :try_start_544
4491 +    :goto_549
4492 +    :try_start_549
4493      const-string v3, "SystemServer"
4494
4495      const-string v9, "DiskStats Service"
4496 @@ -1601,11 +1640,11 @@
4497      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4498
4499      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4500 -    :try_end_555
4501 -    .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_8e3
4502 +    :try_end_55a
4503 +    .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_8e8
4504
4505 -    :goto_555
4506 -    :try_start_555
4507 +    :goto_55a
4508 +    :try_start_55a
4509      const-string v3, "SystemServer"
4510
4511      const-string v9, "SamplingProfiler Service"
4512 @@ -1619,11 +1658,11 @@
4513      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4514
4515      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4516 -    :try_end_566
4517 -    .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_566} :catch_8ef
4518 +    :try_end_56b
4519 +    .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_56b} :catch_8f4
4520
4521 -    :goto_566
4522 -    :try_start_566
4523 +    :goto_56b
4524 +    :try_start_56b
4525      const-string v3, "SystemServer"
4526
4527      const-string v9, "NetworkTimeUpdateService"
4528 @@ -1635,13 +1674,13 @@
4529      move-object/from16 v0, v86
4530
4531      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4532 -    :try_end_574
4533 -    .catch Ljava/lang/Throwable; {:try_start_566 .. :try_end_574} :catch_8fb
4534 +    :try_end_579
4535 +    .catch Ljava/lang/Throwable; {:try_start_56b .. :try_end_579} :catch_900
4536
4537      move-object/from16 v85, v86
4538
4539 -    :goto_576
4540 -    :try_start_576
4541 +    :goto_57b
4542 +    :try_start_57b
4543      const-string v3, "SystemServer"
4544
4545      const-string v9, "CommonTimeManagementService"
4546 @@ -1653,22 +1692,22 @@
4547      move-object/from16 v0, v53
4548
4549      invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4550 -    :try_end_584
4551 -    .catch Ljava/lang/Throwable; {:try_start_576 .. :try_end_584} :catch_907
4552 +    :try_end_589
4553 +    .catch Ljava/lang/Throwable; {:try_start_57b .. :try_end_589} :catch_90c
4554
4555 -    :try_start_584
4556 +    :try_start_589
4557      const-string v3, "commontime_management"
4558
4559      move-object/from16 v0, v53
4560
4561      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4562 -    :try_end_58b
4563 -    .catch Ljava/lang/Throwable; {:try_start_584 .. :try_end_58b} :catch_983
4564 +    :try_end_590
4565 +    .catch Ljava/lang/Throwable; {:try_start_589 .. :try_end_590} :catch_988
4566
4567      move-object/from16 v52, v53
4568
4569 -    :goto_58d
4570 -    :try_start_58d
4571 +    :goto_592
4572 +    :try_start_592
4573      const-string v3, "SystemServer"
4574
4575      const-string v9, "CertBlacklister"
4576 @@ -1678,10 +1717,10 @@
4577      new-instance v3, Lcom/android/server/CertBlacklister;
4578
4579      invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4580 -    :try_end_599
4581 -    .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_599} :catch_913
4582 +    :try_end_59e
4583 +    .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_59e} :catch_918
4584
4585 -    :goto_599
4586 +    :goto_59e
4587      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4588
4589      move-result-object v3
4590 @@ -1692,9 +1731,9 @@
4591
4592      move-result v3
4593
4594 -    if-eqz v3, :cond_5bd
4595 +    if-eqz v3, :cond_5c2
4596
4597 -    :try_start_5a6
4598 +    :try_start_5ab
4599      const-string v3, "SystemServer"
4600
4601      const-string v9, "Dreams Service"
4602 @@ -1706,27 +1745,27 @@
4603      move-object/from16 v0, v66
4604
4605      invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4606 -    :try_end_5b4
4607 -    .catch Ljava/lang/Throwable; {:try_start_5a6 .. :try_end_5b4} :catch_91f
4608 +    :try_end_5b9
4609 +    .catch Ljava/lang/Throwable; {:try_start_5ab .. :try_end_5b9} :catch_924
4610
4611 -    :try_start_5b4
4612 +    :try_start_5b9
4613      const-string v3, "dreams"
4614
4615      move-object/from16 v0, v66
4616
4617      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4618 -    :try_end_5bb
4619 -    .catch Ljava/lang/Throwable; {:try_start_5b4 .. :try_end_5bb} :catch_97f
4620 +    :try_end_5c0
4621 +    .catch Ljava/lang/Throwable; {:try_start_5b9 .. :try_end_5c0} :catch_984
4622
4623      move-object/from16 v65, v66
4624
4625 -    :cond_5bd
4626 -    :goto_5bd
4627 +    :cond_5c2
4628 +    :goto_5c2
4629      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
4630
4631      move-result v28
4632
4633 -    if-eqz v28, :cond_92b
4634 +    if-eqz v28, :cond_930
4635
4636      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4637
4638 @@ -1744,38 +1783,38 @@
4639
4640      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4641
4642 -    :goto_5d4
4643 -    :try_start_5d4
4644 -    invoke-virtual/range {v110 .. v110}, Lcom/android/server/VibratorService;->systemReady()V
4645 -    :try_end_5d7
4646 -    .catch Ljava/lang/Throwable; {:try_start_5d4 .. :try_end_5d7} :catch_934
4647 -
4648 -    :goto_5d7
4649 -    if-eqz v61, :cond_5dc
4650 -
4651 +    :goto_5d9
4652      :try_start_5d9
4653 -    invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4654 +    invoke-virtual/range {v110 .. v110}, Lcom/android/server/VibratorService;->systemReady()V
4655      :try_end_5dc
4656 -    .catch Ljava/lang/Throwable; {:try_start_5d9 .. :try_end_5dc} :catch_940
4657 +    .catch Ljava/lang/Throwable; {:try_start_5d9 .. :try_end_5dc} :catch_939
4658
4659 -    :cond_5dc
4660      :goto_5dc
4661 -    if-eqz v87, :cond_5e1
4662 +    if-eqz v61, :cond_5e1
4663
4664      :try_start_5de
4665 -    invoke-virtual/range {v87 .. v87}, Lcom/android/server/NotificationManagerService;->systemReady()V
4666 +    invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4667      :try_end_5e1
4668 -    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5e1} :catch_94c
4669 +    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5e1} :catch_945
4670
4671      :cond_5e1
4672      :goto_5e1
4673 -    :try_start_5e1
4674 +    if-eqz v87, :cond_5e6
4675 +
4676 +    :try_start_5e3
4677 +    invoke-virtual/range {v87 .. v87}, Lcom/android/server/NotificationManagerService;->systemReady()V
4678 +    :try_end_5e6
4679 +    .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5e6} :catch_951
4680 +
4681 +    :cond_5e6
4682 +    :goto_5e6
4683 +    :try_start_5e6
4684      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4685 -    :try_end_5e4
4686 -    .catch Ljava/lang/Throwable; {:try_start_5e1 .. :try_end_5e4} :catch_958
4687 +    :try_end_5e9
4688 +    .catch Ljava/lang/Throwable; {:try_start_5e6 .. :try_end_5e9} :catch_95d
4689
4690 -    :goto_5e4
4691 -    if-eqz v28, :cond_5ed
4692 +    :goto_5e9
4693 +    if-eqz v28, :cond_5f2
4694
4695      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4696
4697 @@ -1783,7 +1822,7 @@
4698
4699      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4700
4701 -    :cond_5ed
4702 +    :cond_5f2
4703      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4704
4705      move-result-object v54
4706 @@ -1820,18 +1859,18 @@
4707
4708      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4709
4710 -    :try_start_615
4711 +    :try_start_61a
4712      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->systemReady()V
4713 -    :try_end_618
4714 -    .catch Ljava/lang/Throwable; {:try_start_615 .. :try_end_618} :catch_964
4715 +    :try_end_61d
4716 +    .catch Ljava/lang/Throwable; {:try_start_61a .. :try_end_61d} :catch_969
4717
4718 -    :goto_618
4719 -    :try_start_618
4720 +    :goto_61d
4721 +    :try_start_61d
4722      invoke-virtual/range {v78 .. v78}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4723 -    :try_end_61b
4724 -    .catch Ljava/lang/Throwable; {:try_start_618 .. :try_end_61b} :catch_970
4725 +    :try_end_620
4726 +    .catch Ljava/lang/Throwable; {:try_start_61d .. :try_end_620} :catch_975
4727
4728 -    :goto_61b
4729 +    :goto_620
4730      move-object/from16 v17, v4
4731
4732      move-object/from16 v18, v5
4733 @@ -1894,7 +1933,7 @@
4734
4735      move-result v3
4736
4737 -    if-eqz v3, :cond_664
4738 +    if-eqz v3, :cond_669
4739
4740      const-string v3, "SystemServer"
4741
4742 @@ -1902,7 +1941,7 @@
4743
4744      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4745
4746 -    :cond_664
4747 +    :cond_669
4748      invoke-static {}, Landroid/os/Looper;->loop()V
4749
4750      const-string v3, "SystemServer"
4751 @@ -1913,25 +1952,25 @@
4752
4753      return-void
4754
4755 -    :cond_66f
4756 +    :cond_674
4757      const/16 v93, 0x0
4758
4759      goto/16 :goto_35
4760
4761 -    :cond_673
4762 +    :cond_678
4763      const/16 v92, 0x0
4764
4765      goto/16 :goto_47
4766
4767 -    :cond_677
4768 +    :cond_67c
4769      invoke-static/range {v69 .. v69}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4770
4771      move-result v68
4772
4773      goto/16 :goto_60
4774
4775 -    :cond_67d
4776 -    :try_start_67d
4777 +    :cond_682
4778 +    :try_start_682
4779      const-string v3, "1"
4780
4781      move-object/from16 v0, v60
4782 @@ -1952,15 +1991,15 @@
4783
4784      goto/16 :goto_117
4785
4786 -    :cond_692
4787 +    :cond_697
4788      const/4 v3, 0x0
4789
4790      goto/16 :goto_11a
4791
4792 -    :catch_695
4793 +    :catch_69a
4794      move-exception v67
4795
4796 -    :goto_696
4797 +    :goto_69b
4798      const-string v3, "SystemServer"
4799
4800      const-string v9, "Failure starting Account Manager"
4801 @@ -1968,19 +2007,19 @@
4802      move-object/from16 v0, v67
4803
4804      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4805 -    :try_end_69f
4806 -    .catch Ljava/lang/RuntimeException; {:try_start_67d .. :try_end_69f} :catch_6a1
4807 +    :try_end_6a4
4808 +    .catch Ljava/lang/RuntimeException; {:try_start_682 .. :try_end_6a4} :catch_6a6
4809
4810      goto/16 :goto_148
4811
4812 -    :catch_6a1
4813 +    :catch_6a6
4814      move-exception v67
4815
4816      move-object/from16 v7, v43
4817
4818      move-object/from16 v5, v46
4819
4820 -    :goto_6a6
4821 +    :goto_6ab
4822      const-string v3, "System"
4823
4824      const-string v9, "******************************************"
4825 @@ -1995,51 +2034,51 @@
4826
4827      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4828
4829 -    goto/16 :goto_210
4830 +    goto/16 :goto_215
4831
4832 -    :cond_6b8
4833 +    :cond_6bd
4834      const/4 v3, 0x0
4835
4836      goto/16 :goto_155
4837
4838 -    :cond_6bb
4839 +    :cond_6c0
4840      const/4 v3, 0x0
4841
4842      move v9, v3
4843
4844 -    goto/16 :goto_1d3
4845 +    goto/16 :goto_1d8
4846
4847 -    :cond_6bf
4848 +    :cond_6c4
4849      const/4 v3, 0x0
4850
4851 -    goto/16 :goto_1d6
4852 +    goto/16 :goto_1db
4853
4854 -    :cond_6c2
4855 +    :cond_6c7
4856      const/4 v3, 0x1
4857
4858      move/from16 v0, v68
4859
4860 -    if-ne v0, v3, :cond_6d6
4861 +    if-ne v0, v3, :cond_6db
4862
4863 -    :try_start_6c7
4864 +    :try_start_6cc
4865      const-string v3, "SystemServer"
4866
4867      const-string v9, "No Bluetooth Service (factory test)"
4868
4869      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4870
4871 -    goto/16 :goto_20c
4872 +    goto/16 :goto_211
4873
4874 -    :catch_6d0
4875 +    :catch_6d5
4876      move-exception v67
4877
4878      move-object/from16 v110, v111
4879
4880      move-object/from16 v74, v75
4881
4882 -    goto :goto_6a6
4883 +    goto :goto_6ab
4884
4885 -    :cond_6d6
4886 +    :cond_6db
4887      const-string v3, "SystemServer"
4888
4889      const-string v9, "Bluetooth Service"
4890 @@ -2051,10 +2090,10 @@
4891      move-object/from16 v0, v48
4892
4893      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4894 -    :try_end_6e4
4895 -    .catch Ljava/lang/RuntimeException; {:try_start_6c7 .. :try_end_6e4} :catch_6d0
4896 +    :try_end_6e9
4897 +    .catch Ljava/lang/RuntimeException; {:try_start_6cc .. :try_end_6e9} :catch_6d5
4898
4899 -    :try_start_6e4
4900 +    :try_start_6e9
4901      const-string v3, "bluetooth"
4902
4903      move-object/from16 v0, v48
4904 @@ -2075,7 +2114,7 @@
4905
4906      move-result v3
4907
4908 -    if-nez v3, :cond_711
4909 +    if-nez v3, :cond_716
4910
4911      new-instance v50, Landroid/server/BluetoothA2dpService;
4912
4913 @@ -2084,10 +2123,10 @@
4914      move-object/from16 v1, v48
4915
4916      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4917 -    :try_end_705
4918 -    .catch Ljava/lang/RuntimeException; {:try_start_6e4 .. :try_end_705} :catch_a12
4919 +    :try_end_70a
4920 +    .catch Ljava/lang/RuntimeException; {:try_start_6e9 .. :try_end_70a} :catch_a17
4921
4922 -    :try_start_705
4923 +    :try_start_70a
4924      const-string v3, "bluetooth_a2dp"
4925
4926      move-object/from16 v0, v50
4927 @@ -2095,13 +2134,13 @@
4928      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4929
4930      invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
4931 -    :try_end_70f
4932 -    .catch Ljava/lang/RuntimeException; {:try_start_705 .. :try_end_70f} :catch_a1b
4933 +    :try_end_714
4934 +    .catch Ljava/lang/RuntimeException; {:try_start_70a .. :try_end_714} :catch_a20
4935
4936      move-object/from16 v49, v50
4937
4938 -    :cond_711
4939 -    :try_start_711
4940 +    :cond_716
4941 +    :try_start_716
4942      move-object/from16 v0, p0
4943
4944      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4945 @@ -2114,21 +2153,21 @@
4946
4947      move-result v51
4948
4949 -    if-eqz v51, :cond_721
4950 +    if-eqz v51, :cond_726
4951
4952      invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->enable()Z
4953 -    :try_end_721
4954 -    .catch Ljava/lang/RuntimeException; {:try_start_711 .. :try_end_721} :catch_a12
4955 +    :try_end_726
4956 +    .catch Ljava/lang/RuntimeException; {:try_start_716 .. :try_end_726} :catch_a17
4957
4958 -    :cond_721
4959 +    :cond_726
4960      move-object/from16 v47, v48
4961
4962 -    goto/16 :goto_20c
4963 +    goto/16 :goto_211
4964
4965 -    :catch_725
4966 +    :catch_72a
4967      move-exception v67
4968
4969 -    :goto_726
4970 +    :goto_72b
4971      const-string v3, "starting Input Manager Service"
4972
4973      move-object/from16 v0, p0
4974 @@ -2137,9 +2176,9 @@
4975
4976      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4977
4978 -    goto/16 :goto_244
4979 +    goto/16 :goto_249
4980
4981 -    :catch_731
4982 +    :catch_736
4983      move-exception v67
4984
4985      const-string v3, "starting Accessibility Manager"
4986 @@ -2150,9 +2189,9 @@
4987
4988      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4989
4990 -    goto/16 :goto_255
4991 +    goto/16 :goto_25a
4992
4993 -    :catch_73d
4994 +    :catch_742
4995      move-exception v67
4996
4997      const-string v3, "making display ready"
4998 @@ -2163,9 +2202,9 @@
4999
5000      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5001
5002 -    goto/16 :goto_258
5003 +    goto/16 :goto_25d
5004
5005 -    :catch_749
5006 +    :catch_74e
5007      move-exception v67
5008
5009      const-string v3, "performing boot dexopt"
5010 @@ -2176,12 +2215,12 @@
5011
5012      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5013
5014 -    goto/16 :goto_25b
5015 +    goto/16 :goto_260
5016
5017 -    :catch_755
5018 +    :catch_75a
5019      move-exception v67
5020
5021 -    :goto_756
5022 +    :goto_75b
5023      const-string v3, "starting Mount Service"
5024
5025      move-object/from16 v0, p0
5026 @@ -2190,12 +2229,12 @@
5027
5028      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5029
5030 -    goto/16 :goto_29a
5031 +    goto/16 :goto_29f
5032
5033 -    :catch_761
5034 +    :catch_766
5035      move-exception v67
5036
5037 -    :goto_762
5038 +    :goto_767
5039      const-string v3, "starting LockSettingsService service"
5040
5041      move-object/from16 v0, p0
5042 @@ -2204,12 +2243,12 @@
5043
5044      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5045
5046 -    goto/16 :goto_2b1
5047 +    goto/16 :goto_2b6
5048
5049 -    :catch_76d
5050 +    :catch_772
5051      move-exception v67
5052
5053 -    :goto_76e
5054 +    :goto_773
5055      const-string v3, "starting DevicePolicyService"
5056
5057      move-object/from16 v0, p0
5058 @@ -2218,12 +2257,12 @@
5059
5060      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5061
5062 -    goto/16 :goto_2c8
5063 +    goto/16 :goto_2cd
5064
5065 -    :catch_779
5066 +    :catch_77e
5067      move-exception v67
5068
5069 -    :goto_77a
5070 +    :goto_77f
5071      const-string v3, "starting StatusBarManagerService"
5072
5073      move-object/from16 v0, p0
5074 @@ -2232,9 +2271,9 @@
5075
5076      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5077
5078 -    goto/16 :goto_2e1
5079 +    goto/16 :goto_2e6
5080
5081 -    :catch_785
5082 +    :catch_78a
5083      move-exception v67
5084
5085      const-string v3, "starting Clipboard Service"
5086 @@ -2245,9 +2284,9 @@
5087
5088      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5089
5090 -    goto/16 :goto_2f2
5091 +    goto/16 :goto_2f7
5092
5093 -    :catch_791
5094 +    :catch_796
5095      move-exception v67
5096
5097      const-string v3, "starting NetworkManagement Service"
5098 @@ -2258,12 +2297,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_302
5103 +    goto/16 :goto_307
5104
5105 -    :catch_79d
5106 +    :catch_7a2
5107      move-exception v67
5108
5109 -    :goto_79e
5110 +    :goto_7a3
5111      const-string v3, "starting Text Service Manager Service"
5112
5113      move-object/from16 v0, p0
5114 @@ -2272,12 +2311,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_319
5119 +    goto/16 :goto_31e
5120
5121 -    :catch_7a9
5122 +    :catch_7ae
5123      move-exception v67
5124
5125 -    :goto_7aa
5126 +    :goto_7af
5127      const-string v3, "starting NetworkStats Service"
5128
5129      move-object/from16 v0, p0
5130 @@ -2286,14 +2325,14 @@
5131
5132      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5133
5134 -    goto/16 :goto_330
5135 +    goto/16 :goto_335
5136
5137 -    :catch_7b5
5138 +    :catch_7ba
5139      move-exception v67
5140
5141      move-object/from16 v8, v83
5142
5143 -    :goto_7b8
5144 +    :goto_7bd
5145      const-string v3, "starting NetworkPolicy Service"
5146
5147      move-object/from16 v0, p0
5148 @@ -2302,12 +2341,12 @@
5149
5150      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5151
5152 -    goto/16 :goto_347
5153 +    goto/16 :goto_34c
5154
5155 -    :catch_7c3
5156 +    :catch_7c8
5157      move-exception v67
5158
5159 -    :goto_7c4
5160 +    :goto_7c9
5161      const-string v3, "starting Wi-Fi P2pService"
5162
5163      move-object/from16 v0, p0
5164 @@ -2316,12 +2355,12 @@
5165
5166      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5167
5168 -    goto/16 :goto_35e
5169 +    goto/16 :goto_363
5170
5171 -    :catch_7cf
5172 +    :catch_7d4
5173      move-exception v67
5174
5175 -    :goto_7d0
5176 +    :goto_7d5
5177      const-string v3, "starting Wi-Fi Service"
5178
5179      move-object/from16 v0, p0
5180 @@ -2330,12 +2369,12 @@
5181
5182      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5183
5184 -    goto/16 :goto_375
5185 +    goto/16 :goto_37a
5186
5187 -    :catch_7db
5188 +    :catch_7e0
5189      move-exception v67
5190
5191 -    :goto_7dc
5192 +    :goto_7e1
5193      const-string v3, "starting Connectivity Service"
5194
5195      move-object/from16 v0, p0
5196 @@ -2344,9 +2383,9 @@
5197
5198      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5199
5200 -    goto/16 :goto_39c
5201 +    goto/16 :goto_3a1
5202
5203 -    :catch_7e7
5204 +    :catch_7ec
5205      move-exception v67
5206
5207      const-string v3, "starting Service Discovery Service"
5208 @@ -2357,12 +2396,12 @@
5209
5210      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5211
5212 -    goto/16 :goto_3ae
5213 +    goto/16 :goto_3b3
5214
5215 -    :catch_7f3
5216 +    :catch_7f8
5217      move-exception v67
5218
5219 -    :goto_7f4
5220 +    :goto_7f9
5221      const-string v3, "starting ThrottleService"
5222
5223      move-object/from16 v0, p0
5224 @@ -2371,9 +2410,9 @@
5225
5226      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5227
5228 -    goto/16 :goto_3c5
5229 +    goto/16 :goto_3ca
5230
5231 -    :catch_7ff
5232 +    :catch_804
5233      move-exception v67
5234
5235      const-string v3, "starting UpdateLockService"
5236 @@ -2384,9 +2423,9 @@
5237
5238      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5239
5240 -    goto/16 :goto_3d6
5241 +    goto/16 :goto_3db
5242
5243 -    :catch_80b
5244 +    :catch_810
5245      move-exception v67
5246
5247      const-string v3, "making Account Manager Service ready"
5248 @@ -2397,9 +2436,9 @@
5249
5250      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5251
5252 -    goto/16 :goto_3e0
5253 +    goto/16 :goto_3e5
5254
5255 -    :catch_817
5256 +    :catch_81c
5257      move-exception v67
5258
5259      const-string v3, "making Content Service ready"
5260 @@ -2410,12 +2449,12 @@
5261
5262      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5263
5264 -    goto/16 :goto_3e5
5265 +    goto/16 :goto_3ea
5266
5267 -    :catch_823
5268 +    :catch_828
5269      move-exception v67
5270
5271 -    :goto_824
5272 +    :goto_829
5273      const-string v3, "starting Notification Manager"
5274
5275      move-object/from16 v0, p0
5276 @@ -2424,9 +2463,9 @@
5277
5278      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5279
5280 -    goto/16 :goto_405
5281 +    goto/16 :goto_40a
5282
5283 -    :catch_82f
5284 +    :catch_834
5285      move-exception v67
5286
5287      const-string v3, "starting DeviceStorageMonitor service"
5288 @@ -2437,12 +2476,12 @@
5289
5290      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5291
5292 -    goto/16 :goto_416
5293 +    goto/16 :goto_41b
5294
5295 -    :catch_83b
5296 +    :catch_840
5297      move-exception v67
5298
5299 -    :goto_83c
5300 +    :goto_841
5301      const-string v3, "starting Location Manager"
5302
5303      move-object/from16 v0, p0
5304 @@ -2451,12 +2490,12 @@
5305
5306      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5307
5308 -    goto/16 :goto_42d
5309 +    goto/16 :goto_432
5310
5311 -    :catch_847
5312 +    :catch_84c
5313      move-exception v67
5314
5315 -    :goto_848
5316 +    :goto_84d
5317      const-string v3, "starting Country Detector"
5318
5319      move-object/from16 v0, p0
5320 @@ -2465,9 +2504,9 @@
5321
5322      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5323
5324 -    goto/16 :goto_444
5325 +    goto/16 :goto_449
5326
5327 -    :catch_853
5328 +    :catch_858
5329      move-exception v67
5330
5331      const-string v3, "starting Search Service"
5332 @@ -2478,9 +2517,9 @@
5333
5334      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5335
5336 -    goto/16 :goto_455
5337 +    goto/16 :goto_45a
5338
5339 -    :catch_85f
5340 +    :catch_864
5341      move-exception v67
5342
5343      const-string v3, "starting DropBoxManagerService"
5344 @@ -2491,12 +2530,12 @@
5345
5346      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5347
5348 -    goto/16 :goto_46d
5349 +    goto/16 :goto_472
5350
5351 -    :catch_86b
5352 +    :catch_870
5353      move-exception v67
5354
5355 -    :goto_86c
5356 +    :goto_871
5357      const-string v3, "starting Wallpaper Service"
5358
5359      move-object/from16 v0, p0
5360 @@ -2505,9 +2544,9 @@
5361
5362      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5363
5364 -    goto/16 :goto_493
5365 +    goto/16 :goto_498
5366
5367 -    :catch_877
5368 +    :catch_87c
5369      move-exception v67
5370
5371      const-string v3, "starting Audio Service"
5372 @@ -2518,9 +2557,9 @@
5373
5374      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5375
5376 -    goto/16 :goto_4b2
5377 +    goto/16 :goto_4b7
5378
5379 -    :catch_883
5380 +    :catch_888
5381      move-exception v67
5382
5383      const-string v3, "starting DockObserver"
5384 @@ -2531,9 +2570,9 @@
5385
5386      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5387
5388 -    goto/16 :goto_4c2
5389 +    goto/16 :goto_4c7
5390
5391 -    :catch_88f
5392 +    :catch_894
5393      move-exception v67
5394
5395      const-string v3, "starting WiredAccessoryObserver"
5396 @@ -2544,12 +2583,12 @@
5397
5398      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5399
5400 -    goto/16 :goto_4ce
5401 +    goto/16 :goto_4d3
5402
5403 -    :catch_89b
5404 +    :catch_8a0
5405      move-exception v67
5406
5407 -    :goto_89c
5408 +    :goto_8a1
5409      const-string v3, "starting UsbService"
5410
5411      move-object/from16 v0, p0
5412 @@ -2558,12 +2597,12 @@
5413
5414      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5415
5416 -    goto/16 :goto_4e5
5417 +    goto/16 :goto_4ea
5418
5419 -    :catch_8a7
5420 +    :catch_8ac
5421      move-exception v67
5422
5423 -    :goto_8a8
5424 +    :goto_8ad
5425      const-string v3, "SystemServer"
5426
5427      const-string v9, "Failure starting SerialService"
5428 @@ -2572,9 +2611,9 @@
5429
5430      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5431
5432 -    goto/16 :goto_4fc
5433 +    goto/16 :goto_501
5434
5435 -    :catch_8b3
5436 +    :catch_8b8
5437      move-exception v67
5438
5439      const-string v3, "starting UiModeManagerService"
5440 @@ -2585,9 +2624,9 @@
5441
5442      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5443
5444 -    goto/16 :goto_50c
5445 +    goto/16 :goto_511
5446
5447 -    :catch_8bf
5448 +    :catch_8c4
5449      move-exception v67
5450
5451      const-string v3, "SystemServer"
5452 @@ -2598,12 +2637,12 @@
5453
5454      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5455
5456 -    goto/16 :goto_51d
5457 +    goto/16 :goto_522
5458
5459 -    :catch_8cb
5460 +    :catch_8d0
5461      move-exception v67
5462
5463 -    :goto_8cc
5464 +    :goto_8d1
5465      const-string v3, "starting AppWidget Service"
5466
5467      move-object/from16 v0, p0
5468 @@ -2612,9 +2651,9 @@
5469
5470      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5471
5472 -    goto/16 :goto_534
5473 +    goto/16 :goto_539
5474
5475 -    :catch_8d7
5476 +    :catch_8dc
5477      move-exception v67
5478
5479      const-string v3, "starting Recognition Service"
5480 @@ -2625,9 +2664,9 @@
5481
5482      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5483
5484 -    goto/16 :goto_544
5485 +    goto/16 :goto_549
5486
5487 -    :catch_8e3
5488 +    :catch_8e8
5489      move-exception v67
5490
5491      const-string v3, "starting DiskStats Service"
5492 @@ -2638,9 +2677,9 @@
5493
5494      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5495
5496 -    goto/16 :goto_555
5497 +    goto/16 :goto_55a
5498
5499 -    :catch_8ef
5500 +    :catch_8f4
5501      move-exception v67
5502
5503      const-string v3, "starting SamplingProfiler Service"
5504 @@ -2651,9 +2690,9 @@
5505
5506      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5507
5508 -    goto/16 :goto_566
5509 +    goto/16 :goto_56b
5510
5511 -    :catch_8fb
5512 +    :catch_900
5513      move-exception v67
5514
5515      const-string v3, "starting NetworkTimeUpdate service"
5516 @@ -2664,12 +2703,12 @@
5517
5518      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5519
5520 -    goto/16 :goto_576
5521 +    goto/16 :goto_57b
5522
5523 -    :catch_907
5524 +    :catch_90c
5525      move-exception v67
5526
5527 -    :goto_908
5528 +    :goto_90d
5529      const-string v3, "starting CommonTimeManagementService service"
5530
5531      move-object/from16 v0, p0
5532 @@ -2678,9 +2717,9 @@
5533
5534      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5535
5536 -    goto/16 :goto_58d
5537 +    goto/16 :goto_592
5538
5539 -    :catch_913
5540 +    :catch_918
5541      move-exception v67
5542
5543      const-string v3, "starting CertBlacklister"
5544 @@ -2691,12 +2730,12 @@
5545
5546      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5547
5548 -    goto/16 :goto_599
5549 +    goto/16 :goto_59e
5550
5551 -    :catch_91f
5552 +    :catch_924
5553      move-exception v67
5554
5555 -    :goto_920
5556 +    :goto_925
5557      const-string v3, "starting DreamManagerService"
5558
5559      move-object/from16 v0, p0
5560 @@ -2705,18 +2744,18 @@
5561
5562      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5563
5564 -    goto/16 :goto_5bd
5565 +    goto/16 :goto_5c2
5566
5567 -    :cond_92b
5568 +    :cond_930
5569      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5570
5571      move-result-object v3
5572
5573      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5574
5575 -    goto/16 :goto_5d4
5576 +    goto/16 :goto_5d9
5577
5578 -    :catch_934
5579 +    :catch_939
5580      move-exception v67
5581
5582      const-string v3, "making Vibrator Service ready"
5583 @@ -2727,9 +2766,9 @@
5584
5585      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5586
5587 -    goto/16 :goto_5d7
5588 +    goto/16 :goto_5dc
5589
5590 -    :catch_940
5591 +    :catch_945
5592      move-exception v67
5593
5594      const-string v3, "making Device Policy Service ready"
5595 @@ -2740,9 +2779,9 @@
5596
5597      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5598
5599 -    goto/16 :goto_5dc
5600 +    goto/16 :goto_5e1
5601
5602 -    :catch_94c
5603 +    :catch_951
5604      move-exception v67
5605
5606      const-string v3, "making Notification Service ready"
5607 @@ -2753,9 +2792,9 @@
5608
5609      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5610
5611 -    goto/16 :goto_5e1
5612 +    goto/16 :goto_5e6
5613
5614 -    :catch_958
5615 +    :catch_95d
5616      move-exception v67
5617
5618      const-string v3, "making Window Manager Service ready"
5619 @@ -2766,9 +2805,9 @@
5620
5621      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5622
5623 -    goto/16 :goto_5e4
5624 +    goto/16 :goto_5e9
5625
5626 -    :catch_964
5627 +    :catch_969
5628      move-exception v67
5629
5630      const-string v3, "making Package Manager Service ready"
5631 @@ -2779,9 +2818,9 @@
5632
5633      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5634
5635 -    goto/16 :goto_618
5636 +    goto/16 :goto_61d
5637
5638 -    :catch_970
5639 +    :catch_975
5640      move-exception v67
5641
5642      const-string v3, "making Lock Settings Service ready"
5643 @@ -2792,164 +2831,164 @@
5644
5645      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5646
5647 -    goto/16 :goto_61b
5648 +    goto/16 :goto_620
5649
5650 -    :catch_97c
5651 +    :catch_981
5652      move-exception v3
5653
5654      goto/16 :goto_126
5655
5656 -    :catch_97f
5657 +    :catch_984
5658      move-exception v67
5659
5660      move-object/from16 v65, v66
5661
5662 -    goto :goto_920
5663 +    goto :goto_925
5664
5665 -    :catch_983
5666 +    :catch_988
5667      move-exception v67
5668
5669      move-object/from16 v52, v53
5670
5671 -    goto :goto_908
5672 +    goto :goto_90d
5673
5674 -    :catch_987
5675 +    :catch_98c
5676      move-exception v67
5677
5678      move-object/from16 v44, v45
5679
5680 -    goto/16 :goto_8cc
5681 +    goto/16 :goto_8d1
5682
5683 -    :catch_98c
5684 +    :catch_991
5685      move-exception v67
5686
5687      move-object/from16 v96, v97
5688
5689 -    goto/16 :goto_8a8
5690 +    goto/16 :goto_8ad
5691
5692 -    :catch_991
5693 +    :catch_996
5694      move-exception v67
5695
5696      move-object/from16 v108, v109
5697
5698 -    goto/16 :goto_89c
5699 +    goto/16 :goto_8a1
5700
5701 -    :catch_996
5702 +    :catch_99b
5703      move-exception v67
5704
5705      move-object/from16 v113, v114
5706
5707 -    goto/16 :goto_86c
5708 +    goto/16 :goto_871
5709
5710 -    :catch_99b
5711 +    :catch_9a0
5712      move-exception v67
5713
5714      move-object/from16 v58, v59
5715
5716 -    goto/16 :goto_848
5717 +    goto/16 :goto_84d
5718
5719 -    :catch_9a0
5720 +    :catch_9a5
5721      move-exception v67
5722
5723      move-object/from16 v76, v77
5724
5725 -    goto/16 :goto_83c
5726 +    goto/16 :goto_841
5727
5728 -    :catch_9a5
5729 +    :catch_9aa
5730      move-exception v67
5731
5732      move-object/from16 v87, v88
5733
5734 -    goto/16 :goto_824
5735 +    goto/16 :goto_829
5736
5737 -    :catch_9aa
5738 +    :catch_9af
5739      move-exception v67
5740
5741      move-object/from16 v102, v103
5742
5743 -    goto/16 :goto_7f4
5744 +    goto/16 :goto_7f9
5745
5746 -    :catch_9af
5747 +    :catch_9b4
5748      move-exception v67
5749
5750      move-object/from16 v55, v56
5751
5752 -    goto/16 :goto_7dc
5753 +    goto/16 :goto_7e1
5754
5755 -    :catch_9b4
5756 +    :catch_9b9
5757      move-exception v67
5758
5759      move-object/from16 v115, v116
5760
5761 -    goto/16 :goto_7d0
5762 +    goto/16 :goto_7d5
5763
5764 -    :catch_9b9
5765 +    :catch_9be
5766      move-exception v67
5767
5768      move-object/from16 v117, v118
5769
5770 -    goto/16 :goto_7c4
5771 +    goto/16 :goto_7c9
5772
5773 -    :catch_9be
5774 +    :catch_9c3
5775      move-exception v67
5776
5777 -    goto/16 :goto_7b8
5778 +    goto/16 :goto_7bd
5779
5780 -    :catch_9c1
5781 +    :catch_9c6
5782      move-exception v67
5783
5784      move-object/from16 v12, v84
5785
5786 -    goto/16 :goto_7aa
5787 +    goto/16 :goto_7af
5788
5789 -    :catch_9c6
5790 +    :catch_9cb
5791      move-exception v67
5792
5793      move-object/from16 v104, v105
5794
5795 -    goto/16 :goto_79e
5796 +    goto/16 :goto_7a3
5797
5798 -    :catch_9cb
5799 +    :catch_9d0
5800      move-exception v67
5801
5802      move-object/from16 v100, v101
5803
5804 -    goto/16 :goto_77a
5805 +    goto/16 :goto_77f
5806
5807 -    :catch_9d0
5808 +    :catch_9d5
5809      move-exception v67
5810
5811      move-object/from16 v61, v62
5812
5813 -    goto/16 :goto_76e
5814 +    goto/16 :goto_773
5815
5816 -    :catch_9d5
5817 +    :catch_9da
5818      move-exception v67
5819
5820      move-object/from16 v78, v79
5821
5822 -    goto/16 :goto_762
5823 +    goto/16 :goto_767
5824
5825 -    :catch_9da
5826 +    :catch_9df
5827      move-exception v67
5828
5829      move-object/from16 v81, v82
5830
5831 -    goto/16 :goto_756
5832 +    goto/16 :goto_75b
5833
5834 -    :catch_9df
5835 +    :catch_9e4
5836      move-exception v3
5837
5838 -    goto/16 :goto_26e
5839 +    goto/16 :goto_273
5840
5841 -    :catch_9e2
5842 +    :catch_9e7
5843      move-exception v67
5844
5845      move-object/from16 v71, v72
5846
5847 -    goto/16 :goto_726
5848 +    goto/16 :goto_72b
5849
5850 -    :catch_9e7
5851 +    :catch_9ec
5852      move-exception v67
5853
5854      move-object/from16 v7, v43
5855 @@ -2958,9 +2997,9 @@
5856
5857      move-object/from16 v6, v91
5858
5859 -    goto/16 :goto_6a6
5860 +    goto/16 :goto_6ab
5861
5862 -    :catch_9f0
5863 +    :catch_9f5
5864      move-exception v67
5865
5866      move-object/from16 v7, v43
5867 @@ -2969,9 +3008,9 @@
5868
5869      move-object/from16 v41, v42
5870
5871 -    goto/16 :goto_6a6
5872 +    goto/16 :goto_6ab
5873
5874 -    :catch_9f9
5875 +    :catch_9fe
5876      move-exception v67
5877
5878      move-object/from16 v7, v43
5879 @@ -2980,18 +3019,18 @@
5880
5881      move-object/from16 v74, v75
5882
5883 -    goto/16 :goto_6a6
5884 +    goto/16 :goto_6ab
5885
5886 -    :catch_a02
5887 +    :catch_a07
5888      move-exception v67
5889
5890      move-object/from16 v7, v43
5891
5892      move-object/from16 v74, v75
5893
5894 -    goto/16 :goto_6a6
5895 +    goto/16 :goto_6ab
5896
5897 -    :catch_a09
5898 +    :catch_a0e
5899      move-exception v67
5900
5901      move-object/from16 v7, v43
5902 @@ -3000,9 +3039,9 @@
5903
5904      move-object/from16 v74, v75
5905
5906 -    goto/16 :goto_6a6
5907 +    goto/16 :goto_6ab
5908
5909 -    :catch_a12
5910 +    :catch_a17
5911      move-exception v67
5912
5913      move-object/from16 v47, v48
5914 @@ -3011,9 +3050,9 @@
5915
5916      move-object/from16 v74, v75
5917
5918 -    goto/16 :goto_6a6
5919 +    goto/16 :goto_6ab
5920
5921 -    :catch_a1b
5922 +    :catch_a20
5923      move-exception v67
5924
5925      move-object/from16 v49, v50
5926 @@ -3024,17 +3063,17 @@
5927
5928      move-object/from16 v74, v75
5929
5930 -    goto/16 :goto_6a6
5931 +    goto/16 :goto_6ab
5932
5933 -    :catch_a26
5934 +    :catch_a2b
5935      move-exception v67
5936
5937      move-object/from16 v41, v42
5938
5939 -    goto/16 :goto_696
5940 +    goto/16 :goto_69b
5941
5942 -    :cond_a2b
5943 +    :cond_a30
5944      move-object/from16 v8, v83
5945
5946 -    goto/16 :goto_5bd
5947 +    goto/16 :goto_5c2
5948  .end method
5949 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali ext-services/smali/com/android/server/TelephonyRegistry$1.smali
5950 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali   2012-11-06 14:59:27.045115348 -0600
5951 +++ ext-services/smali/com/android/server/TelephonyRegistry$1.smali     1969-12-31 18:00:00.000000000 -0600
5952 @@ -1,14 +0,0 @@
5953 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
5954 -.super Ljava/lang/Object;
5955 -.source "TelephonyRegistry.java"
5956 -
5957 -
5958 -# annotations
5959 -.annotation system Ldalvik/annotation/EnclosingClass;
5960 -    value = Lcom/android/server/TelephonyRegistry;
5961 -.end annotation
5962 -
5963 -.annotation system Ldalvik/annotation/InnerClass;
5964 -    accessFlags = 0x1008
5965 -    name = null
5966 -.end annotation
5967 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali ext-services/smali/com/android/server/TelephonyRegistry$Record.smali
5968 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali      2012-11-06 14:59:27.045115348 -0600
5969 +++ ext-services/smali/com/android/server/TelephonyRegistry$Record.smali        2012-11-06 14:59:13.529048326 -0600
5970 @@ -1,4 +1,4 @@
5971 -.class Lcom/android/server/TelephonyRegistry$Record;
5972 +.class public Lcom/android/server/TelephonyRegistry$Record;
5973  .super Ljava/lang/Object;
5974  .source "TelephonyRegistry.java"
5975
5976 @@ -9,7 +9,7 @@
5977  .end annotation
5978
5979  .annotation system Ldalvik/annotation/InnerClass;
5980 -    accessFlags = 0xa
5981 +    accessFlags = 0x9
5982      name = "Record"
5983  .end annotation
5984
5985 @@ -25,18 +25,10 @@
5986
5987
5988  # direct methods
5989 -.method private constructor <init>()V
5990 +.method public constructor <init>()V
5991      .registers 1
5992
5993      invoke-direct {p0}, Ljava/lang/Object;-><init>()V
5994
5995      return-void
5996  .end method
5997 -
5998 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
5999 -    .registers 2
6000 -
6001 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6002 -
6003 -    return-void
6004 -.end method
6005 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali ext-services/smali/com/android/server/TelephonyRegistry.smali
6006 --- stock-services/smali/com/android/server/TelephonyRegistry.smali     2012-11-06 14:59:27.125115743 -0600
6007 +++ ext-services/smali/com/android/server/TelephonyRegistry.smali       2012-11-06 14:59:13.389047640 -0600
6008 @@ -6,7 +6,6 @@
6009  # annotations
6010  .annotation system Ldalvik/annotation/MemberClasses;
6011      value = {
6012 -        Lcom/android/server/TelephonyRegistry$1;,
6013          Lcom/android/server/TelephonyRegistry$Record;
6014      }
6015  .end annotation
6016 @@ -23,15 +22,15 @@
6017  # instance fields
6018  .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6019
6020 -.field private mCallForwarding:Z
6021 +.field protected mCallForwarding:Z
6022
6023 -.field private mCallIncomingNumber:Ljava/lang/String;
6024 +.field protected mCallIncomingNumber:Ljava/lang/String;
6025
6026 -.field private mCallState:I
6027 +.field protected mCallState:I
6028
6029 -.field private mCellInfo:Landroid/telephony/CellInfo;
6030 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6031
6032 -.field private mCellLocation:Landroid/os/Bundle;
6033 +.field protected mCellLocation:Landroid/os/Bundle;
6034
6035  .field private mConnectedApns:Ljava/util/ArrayList;
6036      .annotation system Ldalvik/annotation/Signature;
6037 @@ -44,9 +43,9 @@
6038      .end annotation
6039  .end field
6040
6041 -.field private final mContext:Landroid/content/Context;
6042 +.field protected final mContext:Landroid/content/Context;
6043
6044 -.field private mDataActivity:I
6045 +.field protected mDataActivity:I
6046
6047  .field private mDataConnectionApn:Ljava/lang/String;
6048
6049 @@ -54,19 +53,19 @@
6050
6051  .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6052
6053 -.field private mDataConnectionNetworkType:I
6054 +.field protected mDataConnectionNetworkType:I
6055
6056  .field private mDataConnectionPossible:Z
6057
6058  .field private mDataConnectionReason:Ljava/lang/String;
6059
6060 -.field private mDataConnectionState:I
6061 +.field protected mDataConnectionState:I
6062
6063 -.field private mMessageWaiting:Z
6064 +.field protected mMessageWaiting:Z
6065
6066 -.field private mOtaspMode:I
6067 +.field protected mOtaspMode:I
6068
6069 -.field private final mRecords:Ljava/util/ArrayList;
6070 +.field protected final mRecords:Ljava/util/ArrayList;
6071      .annotation system Ldalvik/annotation/Signature;
6072          value = {
6073              "Ljava/util/ArrayList",
6074 @@ -77,7 +76,7 @@
6075      .end annotation
6076  .end field
6077
6078 -.field private final mRemoveList:Ljava/util/ArrayList;
6079 +.field protected final mRemoveList:Ljava/util/ArrayList;
6080      .annotation system Ldalvik/annotation/Signature;
6081          value = {
6082              "Ljava/util/ArrayList",
6083 @@ -88,13 +87,13 @@
6084      .end annotation
6085  .end field
6086
6087 -.field private mServiceState:Landroid/telephony/ServiceState;
6088 +.field protected mServiceState:Landroid/telephony/ServiceState;
6089
6090 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6091 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6092
6093
6094  # direct methods
6095 -.method constructor <init>(Landroid/content/Context;)V
6096 +.method protected constructor <init>(Landroid/content/Context;)V
6097      .registers 5
6098
6099      const/4 v2, 0x0
6100 @@ -381,8 +380,8 @@
6101      return-void
6102  .end method
6103
6104 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6105 -    .registers 8
6106 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6107 +    .registers 7
6108
6109      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6110
6111 @@ -391,29 +390,29 @@
6112      :try_start_4
6113      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6114
6115 -    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6116 -
6117 -    move-result v5
6118 -
6119 -    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6120 -    :try_end_d
6121 -    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6122 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6123 +    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6124 +    :try_end_9
6125 +    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6126 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6127
6128 -    :goto_d
6129 +    :goto_9
6130      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6131
6132      new-instance v3, Landroid/content/Intent;
6133
6134 -    const-string v4, "android.intent.action.SERVICE_STATE"
6135 +    const-string v4, "android.intent.action.SIG_STR"
6136
6137      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6138
6139 +    const/high16 v4, 0x2000
6140 +
6141 +    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6142 +
6143      new-instance v0, Landroid/os/Bundle;
6144
6145      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6146
6147 -    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6148 +    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6149
6150      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6151
6152 @@ -423,21 +422,23 @@
6153
6154      return-void
6155
6156 -    :catchall_28
6157 +    :catchall_29
6158      move-exception v4
6159
6160      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6161
6162      throw v4
6163
6164 -    :catch_2d
6165 +    :catch_2e
6166      move-exception v4
6167
6168 -    goto :goto_d
6169 +    goto :goto_9
6170  .end method
6171
6172 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6173 -    .registers 7
6174 +
6175 +# virtual methods
6176 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6177 +    .registers 8
6178
6179      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6180
6181 @@ -446,29 +447,29 @@
6182      :try_start_4
6183      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6184
6185 -    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6186 -    :try_end_9
6187 -    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6188 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6189 +    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6190
6191 -    :goto_9
6192 +    move-result v5
6193 +
6194 +    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6195 +    :try_end_d
6196 +    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6197 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6198 +
6199 +    :goto_d
6200      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6201
6202      new-instance v3, Landroid/content/Intent;
6203
6204 -    const-string v4, "android.intent.action.SIG_STR"
6205 +    const-string v4, "android.intent.action.SERVICE_STATE"
6206
6207      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6208
6209 -    const/high16 v4, 0x2000
6210 -
6211 -    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6212 -
6213      new-instance v0, Landroid/os/Bundle;
6214
6215      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6216
6217 -    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6218 +    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6219
6220      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6221
6222 @@ -478,20 +479,20 @@
6223
6224      return-void
6225
6226 -    :catchall_29
6227 +    :catchall_28
6228      move-exception v4
6229
6230      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6231
6232      throw v4
6233
6234 -    :catch_2e
6235 +    :catch_2d
6236      move-exception v4
6237
6238 -    goto :goto_9
6239 +    goto :goto_d
6240  .end method
6241
6242 -.method private checkListenerPermission(I)V
6243 +.method protected checkListenerPermission(I)V
6244      .registers 5
6245
6246      const/4 v2, 0x0
6247 @@ -532,7 +533,7 @@
6248      return-void
6249  .end method
6250
6251 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6252 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6253      .registers 5
6254
6255      iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6256 @@ -602,111 +603,6 @@
6257      goto :goto_b
6258  .end method
6259
6260 -.method private handleRemoveListLocked()V
6261 -    .registers 4
6262 -
6263 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6264 -
6265 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6266 -
6267 -    move-result v2
6268 -
6269 -    if-lez v2, :cond_23
6270 -
6271 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6272 -
6273 -    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6274 -
6275 -    move-result-object v1
6276 -
6277 -    :goto_e
6278 -    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6279 -
6280 -    move-result v2
6281 -
6282 -    if-eqz v2, :cond_1e
6283 -
6284 -    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6285 -
6286 -    move-result-object v0
6287 -
6288 -    check-cast v0, Landroid/os/IBinder;
6289 -
6290 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6291 -
6292 -    goto :goto_e
6293 -
6294 -    :cond_1e
6295 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6296 -
6297 -    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6298 -
6299 -    :cond_23
6300 -    return-void
6301 -.end method
6302 -
6303 -.method private remove(Landroid/os/IBinder;)V
6304 -    .registers 6
6305 -
6306 -    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6307 -
6308 -    monitor-enter v3
6309 -
6310 -    :try_start_3
6311 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6312 -
6313 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6314 -
6315 -    move-result v1
6316 -
6317 -    const/4 v0, 0x0
6318 -
6319 -    :goto_a
6320 -    if-ge v0, v1, :cond_22
6321 -
6322 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6323 -
6324 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6325 -
6326 -    move-result-object v2
6327 -
6328 -    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6329 -
6330 -    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6331 -
6332 -    if-ne v2, p1, :cond_1f
6333 -
6334 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6335 -
6336 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6337 -
6338 -    monitor-exit v3
6339 -
6340 -    :goto_1e
6341 -    return-void
6342 -
6343 -    :cond_1f
6344 -    add-int/lit8 v0, v0, 0x1
6345 -
6346 -    goto :goto_a
6347 -
6348 -    :cond_22
6349 -    monitor-exit v3
6350 -
6351 -    goto :goto_1e
6352 -
6353 -    :catchall_24
6354 -    move-exception v2
6355 -
6356 -    monitor-exit v3
6357 -    :try_end_26
6358 -    .catchall {:try_start_3 .. :try_end_26} :catchall_24
6359 -
6360 -    throw v2
6361 -.end method
6362 -
6363 -
6364 -# virtual methods
6365  .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6366      .registers 10
6367
6368 @@ -1204,12 +1100,55 @@
6369      goto/16 :goto_32
6370  .end method
6371
6372 +.method protected handleRemoveListLocked()V
6373 +    .registers 4
6374 +
6375 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6376 +
6377 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6378 +
6379 +    move-result v2
6380 +
6381 +    if-lez v2, :cond_23
6382 +
6383 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6384 +
6385 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6386 +
6387 +    move-result-object v1
6388 +
6389 +    :goto_e
6390 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6391 +
6392 +    move-result v2
6393 +
6394 +    if-eqz v2, :cond_1e
6395 +
6396 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6397 +
6398 +    move-result-object v0
6399 +
6400 +    check-cast v0, Landroid/os/IBinder;
6401 +
6402 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6403 +
6404 +    goto :goto_e
6405 +
6406 +    :cond_1e
6407 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6408 +
6409 +    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6410 +
6411 +    :cond_23
6412 +    return-void
6413 +.end method
6414 +
6415  .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6416      .registers 17
6417
6418 -    if-eqz p3, :cond_133
6419 +    if-eqz p3, :cond_131
6420
6421 -    invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6422 +    invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6423
6424      iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6425
6426 @@ -1226,7 +1165,7 @@
6427
6428      invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6429      :try_end_12
6430 -    .catchall {:try_start_9 .. :try_end_12} :catchall_db
6431 +    .catchall {:try_start_9 .. :try_end_12} :catchall_da
6432
6433      move-result v0
6434
6435 @@ -1246,7 +1185,7 @@
6436
6437      check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6438      :try_end_1f
6439 -    .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6440 +    .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6441
6442      :try_start_1f
6443      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6444 @@ -1262,7 +1201,7 @@
6445
6446      iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6447      :try_end_2a
6448 -    .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6449 +    .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6450
6451      if-eqz p4, :cond_c1
6452
6453 @@ -1281,8 +1220,8 @@
6454
6455      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6456      :try_end_3c
6457 -    .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6458 -    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6459 +    .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6460 +    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6461
6462      :cond_3c
6463      :goto_3c
6464 @@ -1308,8 +1247,8 @@
6465      :cond_4d
6466      invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6467      :try_end_50
6468 -    .catchall {:try_start_40 .. :try_end_50} :catchall_db
6469 -    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6470 +    .catchall {:try_start_40 .. :try_end_50} :catchall_da
6471 +    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6472
6473      :cond_50
6474      :goto_50
6475 @@ -1324,8 +1263,8 @@
6476
6477      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6478      :try_end_5b
6479 -    .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6480 -    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6481 +    .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6482 +    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6483
6484      :cond_5b
6485      :goto_5b
6486 @@ -1340,8 +1279,8 @@
6487
6488      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6489      :try_end_66
6490 -    .catchall {:try_start_5f .. :try_end_66} :catchall_db
6491 -    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6492 +    .catchall {:try_start_5f .. :try_end_66} :catchall_da
6493 +    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6494
6495      :cond_66
6496      :goto_66
6497 @@ -1360,8 +1299,8 @@
6498
6499      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6500      :try_end_76
6501 -    .catchall {:try_start_6a .. :try_end_76} :catchall_db
6502 -    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6503 +    .catchall {:try_start_6a .. :try_end_76} :catchall_da
6504 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6505
6506      :cond_76
6507      :goto_76
6508 @@ -1378,8 +1317,8 @@
6509
6510      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6511      :try_end_83
6512 -    .catchall {:try_start_7a .. :try_end_83} :catchall_db
6513 -    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6514 +    .catchall {:try_start_7a .. :try_end_83} :catchall_da
6515 +    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6516
6517      :cond_83
6518      :goto_83
6519 @@ -1396,8 +1335,8 @@
6520
6521      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6522      :try_end_90
6523 -    .catchall {:try_start_87 .. :try_end_90} :catchall_db
6524 -    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6525 +    .catchall {:try_start_87 .. :try_end_90} :catchall_da
6526 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6527
6528      :cond_90
6529      :goto_90
6530 @@ -1412,8 +1351,8 @@
6531
6532      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6533      :try_end_9b
6534 -    .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6535 -    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6536 +    .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6537 +    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6538
6539      :cond_9b
6540      :goto_9b
6541 @@ -1428,8 +1367,8 @@
6542
6543      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6544      :try_end_a6
6545 -    .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6546 -    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6547 +    .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6548 +    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6549
6550      :cond_a6
6551      :goto_a6
6552 @@ -1444,8 +1383,8 @@
6553
6554      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6555      :try_end_b1
6556 -    .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6557 -    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6558 +    .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6559 +    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6560
6561      :cond_b1
6562      :goto_b1
6563 @@ -1464,15 +1403,15 @@
6564
6565      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6566      :try_end_c1
6567 -    .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6568 -    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6569 +    .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6570 +    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6571
6572      :cond_c1
6573      :goto_c1
6574      :try_start_c1
6575      monitor-exit v9
6576      :try_end_c2
6577 -    .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6578 +    .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6579
6580      :goto_c2
6581      return-void
6582 @@ -1488,13 +1427,11 @@
6583      :try_start_c8
6584      new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6585
6586 -    const/4 v8, 0x0
6587 -
6588 -    invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6589 -    :try_end_ce
6590 -    .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6591 +    invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6592 +    :try_end_cd
6593 +    .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6594
6595 -    :try_start_ce
6596 +    :try_start_cd
6597      iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6598
6599      iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6600 @@ -1507,133 +1444,133 @@
6601
6602      goto/16 :goto_23
6603
6604 -    :catchall_db
6605 +    :catchall_da
6606      move-exception v8
6607
6608 -    :goto_dc
6609 +    :goto_db
6610      monitor-exit v9
6611 -    :try_end_dd
6612 -    .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6613 +    :try_end_dc
6614 +    .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6615
6616      throw v8
6617
6618 -    :catch_de
6619 +    :catch_dd
6620      move-exception v2
6621
6622 -    :try_start_df
6623 +    :try_start_de
6624      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6625
6626 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6627 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6628
6629      goto/16 :goto_3c
6630
6631 -    :catch_e6
6632 +    :catch_e5
6633      move-exception v2
6634
6635      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6636
6637 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6638 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6639
6640      goto/16 :goto_50
6641
6642 -    :catch_ee
6643 +    :catch_ed
6644      move-exception v2
6645
6646      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6647
6648 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6649 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6650
6651      goto/16 :goto_5b
6652
6653 -    :catch_f6
6654 +    :catch_f5
6655      move-exception v2
6656
6657      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6658
6659 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6660 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6661
6662      goto/16 :goto_66
6663
6664 -    :catch_fe
6665 +    :catch_fd
6666      move-exception v2
6667
6668      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6669
6670 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6671 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6672
6673      goto/16 :goto_76
6674
6675 -    :catch_106
6676 +    :catch_105
6677      move-exception v2
6678
6679      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6680
6681 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6682 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6683
6684      goto/16 :goto_83
6685
6686 -    :catch_10e
6687 +    :catch_10d
6688      move-exception v2
6689
6690      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6691
6692 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6693 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6694
6695      goto/16 :goto_90
6696
6697 -    :catch_116
6698 +    :catch_115
6699      move-exception v2
6700
6701      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6702
6703 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6704 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6705
6706 -    goto/16 :goto_9b
6707 +    goto :goto_9b
6708
6709 -    :catch_11e
6710 +    :catch_11c
6711      move-exception v2
6712
6713      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6714
6715 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6716 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6717
6718      goto :goto_a6
6719
6720 -    :catch_125
6721 +    :catch_123
6722      move-exception v2
6723
6724      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6725
6726 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6727 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6728
6729      goto :goto_b1
6730
6731 -    :catch_12c
6732 +    :catch_12a
6733      move-exception v2
6734
6735      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6736
6737 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6738 -    :try_end_132
6739 -    .catchall {:try_start_df .. :try_end_132} :catchall_db
6740 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6741 +    :try_end_130
6742 +    .catchall {:try_start_de .. :try_end_130} :catchall_da
6743
6744      goto :goto_c1
6745
6746 -    :cond_133
6747 +    :cond_131
6748      invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6749
6750      move-result-object v8
6751
6752 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6753 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6754
6755      goto :goto_c2
6756
6757 -    :catchall_13b
6758 +    :catchall_139
6759      move-exception v8
6760
6761      move-object v5, v6
6762
6763 -    goto :goto_dc
6764 +    goto :goto_db
6765  .end method
6766
6767  .method public notifyCallForwardingChanged(Z)V
6768 @@ -1641,7 +1578,7 @@
6769
6770      const-string v3, "notifyCallForwardingChanged()"
6771
6772 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6773 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6774
6775      move-result v3
6776
6777 @@ -1719,7 +1656,7 @@
6778
6779      :cond_38
6780      :try_start_38
6781 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6782 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6783
6784      monitor-exit v4
6785      :try_end_3c
6786 @@ -1733,7 +1670,7 @@
6787
6788      const-string v3, "notifyCallState()"
6789
6790 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6791 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6792
6793      move-result v3
6794
6795 @@ -1813,7 +1750,7 @@
6796
6797      :cond_3a
6798      :try_start_3a
6799 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6800 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6801
6802      monitor-exit v4
6803      :try_end_3e
6804 @@ -1829,7 +1766,7 @@
6805
6806      const-string v3, "notifyCellInfo()"
6807
6808 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6809 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6810
6811      move-result v3
6812
6813 @@ -1911,7 +1848,7 @@
6814
6815      :cond_3d
6816      :try_start_3d
6817 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6818 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6819
6820      monitor-exit v4
6821      :try_end_41
6822 @@ -1925,7 +1862,7 @@
6823
6824      const-string v3, "notifyCellLocation()"
6825
6826 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6827 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6828
6829      move-result v3
6830
6831 @@ -2007,7 +1944,7 @@
6832
6833      :cond_3d
6834      :try_start_3d
6835 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6836 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6837
6838      monitor-exit v4
6839      :try_end_41
6840 @@ -2021,7 +1958,7 @@
6841
6842      const-string v3, "notifyDataActivity()"
6843
6844 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6845 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6846
6847      move-result v3
6848
6849 @@ -2099,7 +2036,7 @@
6850
6851      :cond_38
6852      :try_start_38
6853 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6854 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6855
6856      monitor-exit v4
6857      :try_end_3c
6858 @@ -2113,7 +2050,7 @@
6859
6860      const-string v1, "notifyDataConnection()"
6861
6862 -    invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6863 +    invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6864
6865      move-result v1
6866
6867 @@ -2281,7 +2218,7 @@
6868      goto :goto_28
6869
6870      :cond_89
6871 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6872 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6873
6874      :cond_8c
6875      monitor-exit v2
6876 @@ -2316,7 +2253,7 @@
6877
6878      const-string v0, "notifyDataConnectionFailed()"
6879
6880 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6881 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6882
6883      move-result v0
6884
6885 @@ -2336,7 +2273,7 @@
6886
6887      const-string v3, "notifyMessageWaitingChanged()"
6888
6889 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6890 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6891
6892      move-result v3
6893
6894 @@ -2414,7 +2351,7 @@
6895
6896      :cond_38
6897      :try_start_38
6898 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6899 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6900
6901      monitor-exit v4
6902      :try_end_3c
6903 @@ -2428,7 +2365,7 @@
6904
6905      const-string v3, "notifyOtaspChanged()"
6906
6907 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6908 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6909
6910      move-result v3
6911
6912 @@ -2506,7 +2443,7 @@
6913
6914      :cond_38
6915      :try_start_38
6916 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6917 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6918
6919      monitor-exit v4
6920      :try_end_3c
6921 @@ -2516,11 +2453,11 @@
6922  .end method
6923
6924  .method public notifyServiceState(Landroid/telephony/ServiceState;)V
6925 -    .registers 8
6926 +    .registers 10
6927
6928      const-string v3, "notifyServiceState()"
6929
6930 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6931 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6932
6933      move-result v3
6934
6935 @@ -2537,19 +2474,29 @@
6936      :try_start_c
6937      iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6938
6939 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6940 +
6941 +    const-string v5, ""
6942 +
6943 +    const-string v6, ""
6944 +
6945 +    const-string v7, ""
6946 +
6947 +    invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6948 +
6949      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6950
6951      invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6952
6953      move-result-object v1
6954
6955 -    :cond_14
6956 -    :goto_14
6957 +    :cond_1f
6958 +    :goto_1f
6959      invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6960
6961      move-result v3
6962
6963 -    if-eqz v3, :cond_3d
6964 +    if-eqz v3, :cond_51
6965
6966      invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6967
6968 @@ -2558,14 +2505,22 @@
6969      check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6970
6971      iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
6972 -    :try_end_22
6973 -    .catchall {:try_start_c .. :try_end_22} :catchall_3a
6974 +    :try_end_2d
6975 +    .catchall {:try_start_c .. :try_end_2d} :catchall_4e
6976
6977      and-int/lit8 v3, v3, 0x1
6978
6979 -    if-eqz v3, :cond_14
6980 +    if-eqz v3, :cond_1f
6981 +
6982 +    :try_start_31
6983 +    const-string v3, ""
6984 +
6985 +    const-string v5, ""
6986 +
6987 +    const-string v6, ""
6988 +
6989 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6990
6991 -    :try_start_26
6992      iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6993
6994      new-instance v5, Landroid/telephony/ServiceState;
6995 @@ -2573,42 +2528,42 @@
6996      invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
6997
6998      invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6999 -    :try_end_30
7000 -    .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7001 -    .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7002 +    :try_end_44
7003 +    .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7004 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7005
7006 -    goto :goto_14
7007 +    goto :goto_1f
7008
7009 -    :catch_31
7010 +    :catch_45
7011      move-exception v0
7012
7013 -    :try_start_32
7014 +    :try_start_46
7015      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7016
7017      iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7018
7019      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7020
7021 -    goto :goto_14
7022 +    goto :goto_1f
7023
7024 -    :catchall_3a
7025 +    :catchall_4e
7026      move-exception v3
7027
7028      monitor-exit v4
7029 -    :try_end_3c
7030 -    .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7031 +    :try_end_50
7032 +    .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7033
7034      throw v3
7035
7036 -    :cond_3d
7037 -    :try_start_3d
7038 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7039 +    :cond_51
7040 +    :try_start_51
7041 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7042
7043      monitor-exit v4
7044 -    :try_end_41
7045 -    .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7046 +    :try_end_55
7047 +    .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7048
7049 -    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7050 +    invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7051
7052      goto :goto_8
7053  .end method
7054 @@ -2618,7 +2573,7 @@
7055
7056      const-string v4, "notifySignalStrength()"
7057
7058 -    invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7059 +    invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7060
7061      move-result v4
7062
7063 @@ -2741,7 +2696,7 @@
7064      goto :goto_30
7065
7066      :cond_5a
7067 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7068 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7069
7070      monitor-exit v5
7071      :try_end_5e
7072 @@ -2751,3 +2706,63 @@
7073
7074      goto :goto_8
7075  .end method
7076 +
7077 +.method protected remove(Landroid/os/IBinder;)V
7078 +    .registers 6
7079 +
7080 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7081 +
7082 +    monitor-enter v3
7083 +
7084 +    :try_start_3
7085 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7086 +
7087 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7088 +
7089 +    move-result v1
7090 +
7091 +    const/4 v0, 0x0
7092 +
7093 +    :goto_a
7094 +    if-ge v0, v1, :cond_22
7095 +
7096 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7097 +
7098 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7099 +
7100 +    move-result-object v2
7101 +
7102 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7103 +
7104 +    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7105 +
7106 +    if-ne v2, p1, :cond_1f
7107 +
7108 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7109 +
7110 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7111 +
7112 +    monitor-exit v3
7113 +
7114 +    :goto_1e
7115 +    return-void
7116 +
7117 +    :cond_1f
7118 +    add-int/lit8 v0, v0, 0x1
7119 +
7120 +    goto :goto_a
7121 +
7122 +    :cond_22
7123 +    monitor-exit v3
7124 +
7125 +    goto :goto_1e
7126 +
7127 +    :catchall_24
7128 +    move-exception v2
7129 +
7130 +    monitor-exit v3
7131 +    :try_end_26
7132 +    .catchall {:try_start_3 .. :try_end_26} :catchall_24
7133 +
7134 +    throw v2
7135 +.end method