patches/pd2.0/4.1/aosp-mod/20121016/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-10-19 15:30:52.493519409 -0500
   3 +++ ext-services/smali/com/android/server/am/BroadcastQueue.smali       2012-10-19 15:30:40.697460916 -0500
   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, "empty"
 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 +    const/4 v15, 0x1
 704
 705 -    move-object/from16 v0, v22
 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_315
 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 -    move-object/from16 v0, v27
 723 +    if-nez v15, :cond_30f
 724 +
 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 +    move-object/from16 v2, v16
 735
 736 -    invoke-direct {v0, v1, v15, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 737 +    invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 738
 739 -    move-object/from16 v0, v27
 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,43 @@
 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 +    goto :goto_2cb
 802 +
 803 +    :cond_315
 804 +    move-object/from16 v0, v23
 805
 806      check-cast v0, Landroid/content/pm/ResolveInfo;
 807
 808 -    move-object/from16 v18, v0
 809 +    move-object/from16 v19, v0
 810
 811 -    const/16 v29, 0x0
 812 +    const/16 v30, 0x0
 813
 814      move-object/from16 v0, p0
 815
 816      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 817
 818 -    move-object/from16 v0, v18
 819 +    move-object/from16 v0, v19
 820
 821      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 822
 823      iget-object v4, v5, Landroid/content/pm/ActivityInfo;->permission:Ljava/lang/String;
 824
 825 -    move-object/from16 v0, v27
 826 +    move-object/from16 v0, v28
 827
 828      iget v5, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 829
 830 -    move-object/from16 v0, v27
 831 +    move-object/from16 v0, v28
 832
 833      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 834
 835 -    move-object/from16 v0, v18
 836 +    move-object/from16 v0, v19
 837
 838      iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 839
 840 @@ -2769,7 +2942,7 @@
 841
 842      iget v7, v7, Landroid/content/pm/ApplicationInfo;->uid:I
 843
 844 -    move-object/from16 v0, v18
 845 +    move-object/from16 v0, v19
 846
 847      iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 848
 849 @@ -2777,17 +2950,17 @@
 850
 851      invoke-virtual/range {v3 .. v8}, Lcom/android/server/am/ActivityManagerService;->checkComponentPermission(Ljava/lang/String;IIIZ)I
 852
 853 -    move-result v26
 854 +    move-result v27
 855
 856 -    if-eqz v26, :cond_397
 857 +    if-eqz v27, :cond_3cf
 858
 859 -    move-object/from16 v0, v18
 860 +    move-object/from16 v0, v19
 861
 862      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 863
 864      iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
 865
 866 -    if-nez v3, :cond_446
 867 +    if-nez v3, :cond_482
 868
 869      const-string v3, "BroadcastQueue"
 870
 871 @@ -2801,7 +2974,7 @@
 872
 873      move-result-object v5
 874
 875 -    move-object/from16 v0, v27
 876 +    move-object/from16 v0, v28
 877
 878      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 879
 880 @@ -2819,7 +2992,7 @@
 881
 882      move-result-object v5
 883
 884 -    move-object/from16 v0, v27
 885 +    move-object/from16 v0, v28
 886
 887      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
 888
 889 @@ -2833,7 +3006,7 @@
 890
 891      move-result-object v5
 892
 893 -    move-object/from16 v0, v27
 894 +    move-object/from16 v0, v28
 895
 896      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 897
 898 @@ -2847,7 +3020,7 @@
 899
 900      move-result-object v5
 901
 902 -    move-object/from16 v0, v27
 903 +    move-object/from16 v0, v28
 904
 905      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 906
 907 @@ -2867,7 +3040,7 @@
 908
 909      move-result-object v5
 910
 911 -    move-object/from16 v0, v18
 912 +    move-object/from16 v0, v19
 913
 914      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 915
 916 @@ -2885,7 +3058,7 @@
 917
 918      move-result-object v5
 919
 920 -    move-object/from16 v0, v18
 921 +    move-object/from16 v0, v19
 922
 923      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 924
 925 @@ -2901,7 +3074,7 @@
 926
 927      move-result-object v5
 928
 929 -    move-object/from16 v0, v18
 930 +    move-object/from16 v0, v19
 931
 932      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 933
 934 @@ -2917,11 +3090,11 @@
 935
 936      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 937
 938 -    :goto_395
 939 -    const/16 v29, 0x1
 940 +    :goto_3cd
 941 +    const/16 v30, 0x1
 942
 943 -    :cond_397
 944 -    move-object/from16 v0, v18
 945 +    :cond_3cf
 946 +    move-object/from16 v0, v19
 947
 948      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 949
 950 @@ -2931,26 +3104,26 @@
 951
 952      const/16 v5, 0x3e8
 953
 954 -    if-eq v3, v5, :cond_41f
 955 +    if-eq v3, v5, :cond_457
 956
 957 -    move-object/from16 v0, v27
 958 +    move-object/from16 v0, v28
 959
 960      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 961 -    :try_end_3a7
 962 -    .catchall {:try_start_224 .. :try_end_3a7} :catchall_69
 963 +    :try_end_3df
 964 +    .catchall {:try_start_224 .. :try_end_3df} :catchall_69
 965
 966 -    if-eqz v3, :cond_41f
 967 +    if-eqz v3, :cond_457
 968
 969 -    :try_start_3a9
 970 +    :try_start_3e1
 971      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 972
 973      move-result-object v3
 974
 975 -    move-object/from16 v0, v27
 976 +    move-object/from16 v0, v28
 977
 978      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 979
 980 -    move-object/from16 v0, v18
 981 +    move-object/from16 v0, v19
 982
 983      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 984
 985 @@ -2959,16 +3132,16 @@
 986      iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 987
 988      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
 989 -    :try_end_3bc
 990 -    .catchall {:try_start_3a9 .. :try_end_3bc} :catchall_69
 991 -    .catch Landroid/os/RemoteException; {:try_start_3a9 .. :try_end_3bc} :catch_4c8
 992 +    :try_end_3f4
 993 +    .catchall {:try_start_3e1 .. :try_end_3f4} :catchall_69
 994 +    .catch Landroid/os/RemoteException; {:try_start_3e1 .. :try_end_3f4} :catch_504
 995
 996 -    move-result v26
 997 +    move-result v27
 998
 999 -    :goto_3bd
1000 -    if-eqz v26, :cond_41f
1001 +    :goto_3f5
1002 +    if-eqz v27, :cond_457
1003
1004 -    :try_start_3bf
1005 +    :try_start_3f7
1006      const-string v3, "BroadcastQueue"
1007
1008      new-instance v5, Ljava/lang/StringBuilder;
1009 @@ -2981,7 +3154,7 @@
1010
1011      move-result-object v5
1012
1013 -    move-object/from16 v0, v27
1014 +    move-object/from16 v0, v28
1015
1016      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1017
1018 @@ -2995,7 +3168,7 @@
1019
1020      move-result-object v5
1021
1022 -    move-object/from16 v0, v18
1023 +    move-object/from16 v0, v19
1024
1025      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1026
1027 @@ -3013,7 +3186,7 @@
1028
1029      move-result-object v5
1030
1031 -    move-object/from16 v0, v27
1032 +    move-object/from16 v0, v28
1033
1034      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1035
1036 @@ -3027,7 +3200,7 @@
1037
1038      move-result-object v5
1039
1040 -    move-object/from16 v0, v27
1041 +    move-object/from16 v0, v28
1042
1043      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1044
1045 @@ -3041,7 +3214,7 @@
1046
1047      move-result-object v5
1048
1049 -    move-object/from16 v0, v27
1050 +    move-object/from16 v0, v28
1051
1052      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1053
1054 @@ -3061,53 +3234,58 @@
1055
1056      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1057
1058 -    const/16 v29, 0x1
1059 +    const/16 v30, 0x1
1060
1061 -    :cond_41f
1062 -    move-object/from16 v0, v27
1063 +    :cond_457
1064 +    move-object/from16 v0, v28
1065
1066      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1067
1068 -    if-eqz v3, :cond_42f
1069 +    if-eqz v3, :cond_467
1070
1071 -    move-object/from16 v0, v27
1072 +    move-object/from16 v0, v28
1073
1074      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1075
1076      iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
1077
1078 -    if-eqz v3, :cond_42f
1079 +    if-eqz v3, :cond_467
1080 +
1081 +    const/16 v30, 0x1
1082 +
1083 +    :cond_467
1084 +    if-eqz v15, :cond_46b
1085
1086 -    const/16 v29, 0x1
1087 +    const/16 v30, 0x1
1088
1089 -    :cond_42f
1090 -    if-eqz v29, :cond_4cd
1091 +    :cond_46b
1092 +    if-eqz v30, :cond_509
1093
1094      const/4 v3, 0x0
1095
1096 -    move-object/from16 v0, v27
1097 +    move-object/from16 v0, v28
1098
1099      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
1100
1101      const/4 v3, 0x0
1102
1103 -    move-object/from16 v0, v27
1104 +    move-object/from16 v0, v28
1105
1106      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
1107
1108      const/4 v3, 0x0
1109
1110 -    move-object/from16 v0, v27
1111 +    move-object/from16 v0, v28
1112
1113      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1114
1115      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
1116
1117 -    monitor-exit v34
1118 +    monitor-exit v35
1119
1120      goto/16 :goto_93
1121
1122 -    :cond_446
1123 +    :cond_482
1124      const-string v3, "BroadcastQueue"
1125
1126      new-instance v5, Ljava/lang/StringBuilder;
1127 @@ -3120,7 +3298,7 @@
1128
1129      move-result-object v5
1130
1131 -    move-object/from16 v0, v27
1132 +    move-object/from16 v0, v28
1133
1134      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1135
1136 @@ -3138,7 +3316,7 @@
1137
1138      move-result-object v5
1139
1140 -    move-object/from16 v0, v27
1141 +    move-object/from16 v0, v28
1142
1143      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1144
1145 @@ -3152,7 +3330,7 @@
1146
1147      move-result-object v5
1148
1149 -    move-object/from16 v0, v27
1150 +    move-object/from16 v0, v28
1151
1152      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
1153
1154 @@ -3166,7 +3344,7 @@
1155
1156      move-result-object v5
1157
1158 -    move-object/from16 v0, v27
1159 +    move-object/from16 v0, v28
1160
1161      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1162
1163 @@ -3186,7 +3364,7 @@
1164
1165      move-result-object v5
1166
1167 -    move-object/from16 v0, v18
1168 +    move-object/from16 v0, v19
1169
1170      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1171
1172 @@ -3202,7 +3380,7 @@
1173
1174      move-result-object v5
1175
1176 -    move-object/from16 v0, v18
1177 +    move-object/from16 v0, v19
1178
1179      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1180
1181 @@ -3218,7 +3396,7 @@
1182
1183      move-result-object v5
1184
1185 -    move-object/from16 v0, v18
1186 +    move-object/from16 v0, v19
1187
1188      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1189
1190 @@ -3234,23 +3412,23 @@
1191
1192      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1193
1194 -    goto/16 :goto_395
1195 +    goto/16 :goto_3cd
1196
1197 -    :catch_4c8
1198 +    :catch_504
1199      move-exception v14
1200
1201 -    const/16 v26, -0x1
1202 +    const/16 v27, -0x1
1203
1204 -    goto/16 :goto_3bd
1205 +    goto/16 :goto_3f5
1206
1207 -    :cond_4cd
1208 +    :cond_509
1209      const/4 v3, 0x1
1210
1211 -    move-object/from16 v0, v27
1212 +    move-object/from16 v0, v28
1213
1214      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1215
1216 -    move-object/from16 v0, v18
1217 +    move-object/from16 v0, v19
1218
1219      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1220
1221 @@ -3258,7 +3436,7 @@
1222
1223      new-instance v3, Landroid/content/ComponentName;
1224
1225 -    move-object/from16 v0, v18
1226 +    move-object/from16 v0, v19
1227
1228      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1229
1230 @@ -3266,7 +3444,7 @@
1231
1232      iget-object v5, v5, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1233
1234 -    move-object/from16 v0, v18
1235 +    move-object/from16 v0, v19
1236
1237      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1238
1239 @@ -3274,29 +3452,29 @@
1240
1241      invoke-direct {v3, v5, v6}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
1242
1243 -    move-object/from16 v0, v27
1244 +    move-object/from16 v0, v28
1245
1246      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1247
1248 -    move-object/from16 v0, v27
1249 +    move-object/from16 v0, v28
1250
1251      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1252
1253      const/16 v5, 0x3e8
1254
1255 -    if-eq v3, v5, :cond_521
1256 +    if-eq v3, v5, :cond_55d
1257
1258      move-object/from16 v0, p0
1259
1260      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1261
1262 -    move-object/from16 v0, v18
1263 +    move-object/from16 v0, v19
1264
1265      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1266
1267      iget-object v5, v5, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1268
1269 -    move-object/from16 v0, v18
1270 +    move-object/from16 v0, v19
1271
1272      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1273
1274 @@ -3304,48 +3482,48 @@
1275
1276      invoke-virtual {v3, v5, v6}, Lcom/android/server/am/ActivityManagerService;->isSingleton(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Z
1277
1278 -    move-result v20
1279 +    move-result v21
1280
1281 -    if-eqz v20, :cond_56a
1282 +    if-eqz v21, :cond_5a6
1283
1284 -    const/16 v31, 0x0
1285 +    const/16 v32, 0x0
1286
1287 -    :goto_50f
1288 +    :goto_54b
1289      move-object/from16 v0, p0
1290
1291      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1292
1293 -    move-object/from16 v0, v18
1294 +    move-object/from16 v0, v19
1295
1296      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1297
1298 -    move/from16 v0, v31
1299 +    move/from16 v0, v32
1300
1301      invoke-virtual {v3, v5, v0}, Lcom/android/server/am/ActivityManagerService;->getActivityInfoForUser(Landroid/content/pm/ActivityInfo;I)Landroid/content/pm/ActivityInfo;
1302
1303      move-result-object v3
1304
1305 -    move-object/from16 v0, v18
1306 +    move-object/from16 v0, v19
1307
1308      iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1309
1310 -    :cond_521
1311 -    move-object/from16 v0, v18
1312 +    :cond_55d
1313 +    move-object/from16 v0, v19
1314
1315      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1316
1317 -    move-object/from16 v0, v27
1318 +    move-object/from16 v0, v28
1319
1320      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
1321 -    :try_end_529
1322 -    .catchall {:try_start_3bf .. :try_end_529} :catchall_69
1323 +    :try_end_565
1324 +    .catchall {:try_start_3f7 .. :try_end_565} :catchall_69
1325
1326 -    :try_start_529
1327 +    :try_start_565
1328      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
1329
1330      move-result-object v3
1331
1332 -    move-object/from16 v0, v27
1333 +    move-object/from16 v0, v28
1334
1335      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1336
1337 @@ -3355,7 +3533,7 @@
1338
1339      const/4 v6, 0x0
1340
1341 -    move-object/from16 v0, v27
1342 +    move-object/from16 v0, v28
1343
1344      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1345
1346 @@ -3364,18 +3542,18 @@
1347      move-result v7
1348
1349      invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
1350 -    :try_end_541
1351 -    .catchall {:try_start_529 .. :try_end_541} :catchall_69
1352 -    .catch Landroid/os/RemoteException; {:try_start_529 .. :try_end_541} :catch_671
1353 -    .catch Ljava/lang/IllegalArgumentException; {:try_start_529 .. :try_end_541} :catch_573
1354 +    :try_end_57d
1355 +    .catchall {:try_start_565 .. :try_end_57d} :catchall_69
1356 +    .catch Landroid/os/RemoteException; {:try_start_565 .. :try_end_57d} :catch_6ad
1357 +    .catch Ljava/lang/IllegalArgumentException; {:try_start_565 .. :try_end_57d} :catch_5af
1358
1359 -    :goto_541
1360 -    :try_start_541
1361 +    :goto_57d
1362 +    :try_start_57d
1363      move-object/from16 v0, p0
1364
1365      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1366
1367 -    move-object/from16 v0, v18
1368 +    move-object/from16 v0, v19
1369
1370      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1371
1372 @@ -3387,16 +3565,16 @@
1373
1374      move-result-object v13
1375
1376 -    if-eqz v13, :cond_5bc
1377 +    if-eqz v13, :cond_5f8
1378
1379      iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
1380 -    :try_end_555
1381 -    .catchall {:try_start_541 .. :try_end_555} :catchall_69
1382 +    :try_end_591
1383 +    .catchall {:try_start_57d .. :try_end_591} :catchall_69
1384
1385 -    if-eqz v3, :cond_5bc
1386 +    if-eqz v3, :cond_5f8
1387
1388 -    :try_start_557
1389 -    move-object/from16 v0, v18
1390 +    :try_start_593
1391 +    move-object/from16 v0, v19
1392
1393      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1394
1395 @@ -3406,30 +3584,30 @@
1396
1397      move-object/from16 v0, p0
1398
1399 -    move-object/from16 v1, v27
1400 +    move-object/from16 v1, v28
1401
1402      invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
1403 -    :try_end_567
1404 -    .catchall {:try_start_557 .. :try_end_567} :catchall_69
1405 -    .catch Landroid/os/RemoteException; {:try_start_557 .. :try_end_567} :catch_59f
1406 +    :try_end_5a3
1407 +    .catchall {:try_start_593 .. :try_end_5a3} :catchall_69
1408 +    .catch Landroid/os/RemoteException; {:try_start_593 .. :try_end_5a3} :catch_5db
1409
1410 -    :try_start_567
1411 -    monitor-exit v34
1412 +    :try_start_5a3
1413 +    monitor-exit v35
1414
1415      goto/16 :goto_93
1416
1417 -    :cond_56a
1418 -    move-object/from16 v0, v27
1419 +    :cond_5a6
1420 +    move-object/from16 v0, v28
1421
1422      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1423
1424      invoke-static {v3}, Landroid/os/UserId;->getUserId(I)I
1425
1426 -    move-result v31
1427 +    move-result v32
1428
1429 -    goto :goto_50f
1430 +    goto :goto_54b
1431
1432 -    :catch_573
1433 +    :catch_5af
1434      move-exception v14
1435
1436      const-string v3, "BroadcastQueue"
1437 @@ -3444,7 +3622,7 @@
1438
1439      move-result-object v5
1440
1441 -    move-object/from16 v0, v27
1442 +    move-object/from16 v0, v28
1443
1444      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1445
1446 @@ -3472,9 +3650,9 @@
1447
1448      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1449
1450 -    goto :goto_541
1451 +    goto :goto_57d
1452
1453 -    :catch_59f
1454 +    :catch_5db
1455      move-exception v14
1456
1457      const-string v3, "BroadcastQueue"
1458 @@ -3489,7 +3667,7 @@
1459
1460      move-result-object v5
1461
1462 -    move-object/from16 v0, v27
1463 +    move-object/from16 v0, v28
1464
1465      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1466
1467 @@ -3503,12 +3681,12 @@
1468
1469      invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1470
1471 -    :cond_5bc
1472 +    :cond_5f8
1473      move-object/from16 v0, p0
1474
1475      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1476
1477 -    move-object/from16 v0, v18
1478 +    move-object/from16 v0, v19
1479
1480      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1481
1482 @@ -3516,7 +3694,7 @@
1483
1484      const/4 v6, 0x1
1485
1486 -    move-object/from16 v0, v27
1487 +    move-object/from16 v0, v28
1488
1489      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1490
1491 @@ -3528,11 +3706,11 @@
1492
1493      const-string v8, "broadcast"
1494
1495 -    move-object/from16 v0, v27
1496 +    move-object/from16 v0, v28
1497
1498      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1499
1500 -    move-object/from16 v0, v27
1501 +    move-object/from16 v0, v28
1502
1503      iget-object v10, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1504
1505 @@ -3544,22 +3722,22 @@
1506
1507      and-int/2addr v10, v11
1508
1509 -    if-eqz v10, :cond_660
1510 +    if-eqz v10, :cond_69c
1511
1512      const/4 v10, 0x1
1513
1514 -    :goto_5e5
1515 +    :goto_621
1516      const/4 v11, 0x0
1517
1518      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;
1519
1520      move-result-object v3
1521
1522 -    move-object/from16 v0, v27
1523 +    move-object/from16 v0, v28
1524
1525      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1526
1527 -    if-nez v3, :cond_662
1528 +    if-nez v3, :cond_69e
1529
1530      const-string v3, "BroadcastQueue"
1531
1532 @@ -3573,7 +3751,7 @@
1533
1534      move-result-object v5
1535
1536 -    move-object/from16 v0, v18
1537 +    move-object/from16 v0, v19
1538
1539      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1540
1541 @@ -3591,7 +3769,7 @@
1542
1543      move-result-object v5
1544
1545 -    move-object/from16 v0, v18
1546 +    move-object/from16 v0, v19
1547
1548      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1549
1550 @@ -3609,7 +3787,7 @@
1551
1552      move-result-object v5
1553
1554 -    move-object/from16 v0, v27
1555 +    move-object/from16 v0, v28
1556
1557      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1558
1559 @@ -3631,23 +3809,23 @@
1560
1561      move-object/from16 v0, p0
1562
1563 -    move-object/from16 v1, v27
1564 +    move-object/from16 v1, v28
1565
1566      invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1567
1568 -    move-object/from16 v0, v27
1569 +    move-object/from16 v0, v28
1570
1571      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1572
1573 -    move-object/from16 v0, v27
1574 +    move-object/from16 v0, v28
1575
1576      iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1577
1578 -    move-object/from16 v0, v27
1579 +    move-object/from16 v0, v28
1580
1581      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1582
1583 -    move-object/from16 v0, v27
1584 +    move-object/from16 v0, v28
1585
1586      iget-boolean v10, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1587
1588 @@ -3655,7 +3833,7 @@
1589
1590      move-object/from16 v5, p0
1591
1592 -    move-object/from16 v6, v27
1593 +    move-object/from16 v6, v28
1594
1595      invoke-virtual/range {v5 .. v11}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1596
1597 @@ -3663,42 +3841,42 @@
1598
1599      const/4 v3, 0x0
1600
1601 -    move-object/from16 v0, v27
1602 +    move-object/from16 v0, v28
1603
1604      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1605
1606 -    monitor-exit v34
1607 +    monitor-exit v35
1608
1609      goto/16 :goto_93
1610
1611 -    :cond_660
1612 +    :cond_69c
1613      const/4 v10, 0x0
1614
1615 -    goto :goto_5e5
1616 +    goto :goto_621
1617
1618 -    :cond_662
1619 -    move-object/from16 v0, v27
1620 +    :cond_69e
1621 +    move-object/from16 v0, v28
1622
1623      move-object/from16 v1, p0
1624
1625      iput-object v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
1626
1627 -    move/from16 v0, v28
1628 +    move/from16 v0, v29
1629
1630      move-object/from16 v1, p0
1631
1632      iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
1633
1634 -    monitor-exit v34
1635 -    :try_end_66f
1636 -    .catchall {:try_start_567 .. :try_end_66f} :catchall_69
1637 +    monitor-exit v35
1638 +    :try_end_6ab
1639 +    .catchall {:try_start_5a3 .. :try_end_6ab} :catchall_69
1640
1641      goto/16 :goto_93
1642
1643 -    :catch_671
1644 +    :catch_6ad
1645      move-exception v3
1646
1647 -    goto/16 :goto_541
1648 +    goto/16 :goto_57d
1649  .end method
1650
1651  .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
1652 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali
1653 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali    1969-12-31 18:00:00.000000000 -0600
1654 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali      2012-10-19 15:30:39.637455661 -0500
1655 @@ -0,0 +1,180 @@
1656 +.class Lcom/android/server/PrivacyTelephonyRegistry$1;
1657 +.super Landroid/content/BroadcastReceiver;
1658 +.source "PrivacyTelephonyRegistry.java"
1659 +
1660 +
1661 +# annotations
1662 +.annotation system Ldalvik/annotation/EnclosingClass;
1663 +    value = Lcom/android/server/PrivacyTelephonyRegistry;
1664 +.end annotation
1665 +
1666 +.annotation system Ldalvik/annotation/InnerClass;
1667 +    accessFlags = 0x0
1668 +    name = null
1669 +.end annotation
1670 +
1671 +
1672 +# instance fields
1673 +.field final synthetic this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1674 +
1675 +
1676 +# direct methods
1677 +.method constructor <init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1678 +    .registers 2
1679 +
1680 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1681 +
1682 +    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
1683 +
1684 +    return-void
1685 +.end method
1686 +
1687 +
1688 +# virtual methods
1689 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
1690 +    .registers 10
1691 +
1692 +    const/4 v6, 0x0
1693 +
1694 +    invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
1695 +
1696 +    move-result-object v3
1697 +
1698 +    const-string v4, "android.privacy.BLOCKED_PHONE_CALL"
1699 +
1700 +    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1701 +
1702 +    move-result v3
1703 +
1704 +    if-eqz v3, :cond_44
1705 +
1706 +    new-instance v0, Landroid/os/Bundle;
1707 +
1708 +    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
1709 +
1710 +    invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
1711 +
1712 +    move-result-object v0
1713 +
1714 +    const-string v3, "packageName"
1715 +
1716 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1717 +
1718 +    move-result-object v1
1719 +
1720 +    const-string v3, "packageName"
1721 +
1722 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1723 +
1724 +    move-result v3
1725 +
1726 +    if-eqz v3, :cond_45
1727 +
1728 +    const-string v3, "PrivacyTelephonyRegistry"
1729 +
1730 +    new-instance v4, Ljava/lang/StringBuilder;
1731 +
1732 +    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
1733 +
1734 +    const-string v5, "got blocked phone call INTENT from package: "
1735 +
1736 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1737 +
1738 +    move-result-object v4
1739 +
1740 +    const-string v5, "packageName"
1741 +
1742 +    invoke-virtual {v0, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1743 +
1744 +    move-result-object v5
1745 +
1746 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1747 +
1748 +    move-result-object v4
1749 +
1750 +    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1751 +
1752 +    move-result-object v4
1753 +
1754 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1755 +
1756 +    :goto_42
1757 +    if-nez v1, :cond_4d
1758 +
1759 +    :cond_44
1760 +    :goto_44
1761 +    return-void
1762 +
1763 +    :cond_45
1764 +    const-string v3, "PrivacyTelephonyRegistry"
1765 +
1766 +    const-string v4, "got blocked phone call INTENT without package information"
1767 +
1768 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1769 +
1770 +    goto :goto_42
1771 +
1772 +    :cond_4d
1773 +    const-string v3, "phoneState"
1774 +
1775 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1776 +
1777 +    move-result v3
1778 +
1779 +    if-eqz v3, :cond_76
1780 +
1781 +    const-string v3, "phoneState"
1782 +
1783 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
1784 +
1785 +    move-result v2
1786 +
1787 +    packed-switch v2, :pswitch_data_7e
1788 +
1789 +    goto :goto_44
1790 +
1791 +    :pswitch_5f
1792 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1793 +
1794 +    const/4 v4, 0x0
1795 +
1796 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1797 +
1798 +    goto :goto_44
1799 +
1800 +    :pswitch_66
1801 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1802 +
1803 +    const/4 v4, 0x2
1804 +
1805 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1806 +
1807 +    goto :goto_44
1808 +
1809 +    :pswitch_6d
1810 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1811 +
1812 +    const/4 v4, 0x1
1813 +
1814 +    const-string v5, "12345"
1815 +
1816 +    invoke-virtual {v3, v4, v5, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1817 +
1818 +    goto :goto_44
1819 +
1820 +    :cond_76
1821 +    const-string v3, "PrivacyTelephonyRegistry"
1822 +
1823 +    const-string v4, "we forgot to put phoneState in Intent?"
1824 +
1825 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1826 +
1827 +    goto :goto_44
1828 +
1829 +    :pswitch_data_7e
1830 +    .packed-switch 0x0
1831 +        :pswitch_5f
1832 +        :pswitch_6d
1833 +        :pswitch_66
1834 +    .end packed-switch
1835 +.end method
1836 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali
1837 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali      1969-12-31 18:00:00.000000000 -0600
1838 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali        2012-10-19 15:30:39.673455838 -0500
1839 @@ -0,0 +1,1410 @@
1840 +.class public Lcom/android/server/PrivacyTelephonyRegistry;
1841 +.super Lcom/android/server/TelephonyRegistry;
1842 +.source "PrivacyTelephonyRegistry.java"
1843 +
1844 +
1845 +# static fields
1846 +.field private static final PERMISSION_CALL_STATE:I = 0x3
1847 +
1848 +.field private static final PERMISSION_CELL_INFO:I = 0x1
1849 +
1850 +.field private static final PERMISSION_CELL_LOCATION:I = 0x0
1851 +
1852 +.field private static final PERMISSION_SERVICE_STATE:I = 0x4
1853 +
1854 +.field private static final PERMISSION_SIGNAL_STRENGTH:I = 0x2
1855 +
1856 +.field private static final P_TAG:Ljava/lang/String; = "PrivacyTelephonyRegistry"
1857 +
1858 +
1859 +# instance fields
1860 +.field private pSetMan:Landroid/privacy/PrivacySettingsManager;
1861 +
1862 +.field private final privacyReceiver:Landroid/content/BroadcastReceiver;
1863 +
1864 +
1865 +# direct methods
1866 +.method public constructor <init>(Landroid/content/Context;)V
1867 +    .registers 5
1868 +
1869 +    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
1870 +
1871 +    new-instance v1, Lcom/android/server/PrivacyTelephonyRegistry$1;
1872 +
1873 +    invoke-direct {v1, p0}, Lcom/android/server/PrivacyTelephonyRegistry$1;-><init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1874 +
1875 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
1876 +
1877 +    new-instance v1, Landroid/privacy/PrivacySettingsManager;
1878 +
1879 +    const-string v2, "privacy"
1880 +
1881 +    invoke-static {v2}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
1882 +
1883 +    move-result-object v2
1884 +
1885 +    invoke-static {v2}, Landroid/privacy/IPrivacySettingsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/privacy/IPrivacySettingsManager;
1886 +
1887 +    move-result-object v2
1888 +
1889 +    invoke-direct {v1, p1, v2}, Landroid/privacy/PrivacySettingsManager;-><init>(Landroid/content/Context;Landroid/privacy/IPrivacySettingsManager;)V
1890 +
1891 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1892 +
1893 +    :try_start_1b
1894 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
1895 +    :try_end_1e
1896 +    .catch Ljava/lang/Exception; {:try_start_1b .. :try_end_1e} :catch_26
1897 +
1898 +    :goto_1e
1899 +    const-string v1, "PrivacyTelephonyRegistry"
1900 +
1901 +    const-string v2, "constructor ready"
1902 +
1903 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1904 +
1905 +    return-void
1906 +
1907 +    :catch_26
1908 +    move-exception v0
1909 +
1910 +    const-string v1, "PrivacyTelephonyRegistry"
1911 +
1912 +    const-string v2, "failed to register privacy broadcastreceiver"
1913 +
1914 +    invoke-static {v1, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
1915 +
1916 +    goto :goto_1e
1917 +.end method
1918 +
1919 +.method private isPackageAllowed(ILjava/lang/String;)Z
1920 +    .registers 8
1921 +
1922 +    const/4 v2, 0x1
1923 +
1924 +    const/4 v1, 0x0
1925 +
1926 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1927 +
1928 +    invoke-static {}, Landroid/os/Process;->myUid()I
1929 +
1930 +    move-result v4
1931 +
1932 +    invoke-virtual {v3, p2, v4}, Landroid/privacy/PrivacySettingsManager;->getSettings(Ljava/lang/String;I)Landroid/privacy/PrivacySettings;
1933 +
1934 +    move-result-object v0
1935 +
1936 +    if-nez v0, :cond_f
1937 +
1938 +    :cond_e
1939 +    :goto_e
1940 +    return v1
1941 +
1942 +    :cond_f
1943 +    packed-switch p1, :pswitch_data_42
1944 +
1945 +    goto :goto_e
1946 +
1947 +    :pswitch_13
1948 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1949 +
1950 +    move-result v3
1951 +
1952 +    if-nez v3, :cond_e
1953 +
1954 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationGpsSetting()B
1955 +
1956 +    move-result v3
1957 +
1958 +    if-nez v3, :cond_e
1959 +
1960 +    move v1, v2
1961 +
1962 +    goto :goto_e
1963 +
1964 +    :pswitch_21
1965 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1966 +
1967 +    move-result v3
1968 +
1969 +    if-nez v3, :cond_e
1970 +
1971 +    move v1, v2
1972 +
1973 +    goto :goto_e
1974 +
1975 +    :pswitch_29
1976 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()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_31
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_39
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 +    nop
2009 +
2010 +    :pswitch_data_42
2011 +    .packed-switch 0x0
2012 +        :pswitch_13
2013 +        :pswitch_21
2014 +        :pswitch_29
2015 +        :pswitch_31
2016 +        :pswitch_39
2017 +    .end packed-switch
2018 +.end method
2019 +
2020 +.method private registerPrivacy()V
2021 +    .registers 4
2022 +
2023 +    new-instance v0, Landroid/content/IntentFilter;
2024 +
2025 +    const-string v1, "android.privacy.BLOCKED_PHONE_CALL"
2026 +
2027 +    invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
2028 +
2029 +    iget-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mContext:Landroid/content/Context;
2030 +
2031 +    iget-object v2, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2032 +
2033 +    invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
2034 +
2035 +    return-void
2036 +.end method
2037 +
2038 +
2039 +# virtual methods
2040 +.method public bridge synthetic dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2041 +    .registers 4
2042 +
2043 +    invoke-super {p0, p1, p2, p3}, Lcom/android/server/TelephonyRegistry;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2044 +
2045 +    return-void
2046 +.end method
2047 +
2048 +.method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
2049 +    .registers 19
2050 +
2051 +    :try_start_0
2052 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2053 +    :try_end_3
2054 +    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_3} :catch_af
2055 +
2056 +    :goto_3
2057 +    if-eqz p3, :cond_110
2058 +
2059 +    move/from16 v0, p3
2060 +
2061 +    invoke-virtual {p0, v0}, Lcom/android/server/PrivacyTelephonyRegistry;->checkListenerPermission(I)V
2062 +
2063 +    iget-object v11, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2064 +
2065 +    monitor-enter v11
2066 +
2067 +    const/4 v7, 0x0
2068 +
2069 +    :try_start_e
2070 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2071 +
2072 +    move-result-object v2
2073 +
2074 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2075 +
2076 +    invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
2077 +    :try_end_17
2078 +    .catchall {:try_start_e .. :try_end_17} :catchall_d2
2079 +
2080 +    move-result v1
2081 +
2082 +    const/4 v6, 0x0
2083 +
2084 +    move-object v8, v7
2085 +
2086 +    :goto_1a
2087 +    if-ge v6, v1, :cond_be
2088 +
2089 +    :try_start_1c
2090 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2091 +
2092 +    invoke-virtual {v10, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
2093 +
2094 +    move-result-object v7
2095 +
2096 +    check-cast v7, Lcom/android/server/TelephonyRegistry$Record;
2097 +    :try_end_24
2098 +    .catchall {:try_start_1c .. :try_end_24} :catchall_118
2099 +
2100 +    :try_start_24
2101 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2102 +
2103 +    if-ne v2, v10, :cond_b9
2104 +
2105 +    :goto_28
2106 +    iget v10, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2107 +
2108 +    xor-int v10, v10, p3
2109 +
2110 +    and-int v9, p3, v10
2111 +
2112 +    move/from16 v0, p3
2113 +
2114 +    iput v0, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2115 +    :try_end_32
2116 +    .catchall {:try_start_24 .. :try_end_32} :catchall_d2
2117 +
2118 +    if-eqz p4, :cond_ad
2119 +
2120 +    and-int/lit8 v10, p3, 0x1
2121 +
2122 +    if-eqz v10, :cond_38
2123 +
2124 +    :cond_38
2125 +    and-int/lit8 v10, p3, 0x2
2126 +
2127 +    if-eqz v10, :cond_4c
2128 +
2129 +    :try_start_3c
2130 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2131 +
2132 +    invoke-virtual {v10}, Landroid/telephony/SignalStrength;->getGsmSignalStrength()I
2133 +
2134 +    move-result v5
2135 +
2136 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2137 +
2138 +    const/16 v12, 0x63
2139 +
2140 +    if-ne v5, v12, :cond_49
2141 +
2142 +    const/4 v5, -0x1
2143 +
2144 +    :cond_49
2145 +    invoke-interface {v10, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
2146 +    :try_end_4c
2147 +    .catchall {:try_start_3c .. :try_end_4c} :catchall_d2
2148 +    .catch Landroid/os/RemoteException; {:try_start_3c .. :try_end_4c} :catch_d5
2149 +
2150 +    :cond_4c
2151 +    :goto_4c
2152 +    and-int/lit8 v10, p3, 0x4
2153 +
2154 +    if-eqz v10, :cond_57
2155 +
2156 +    :try_start_50
2157 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2158 +
2159 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mMessageWaiting:Z
2160 +
2161 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
2162 +    :try_end_57
2163 +    .catchall {:try_start_50 .. :try_end_57} :catchall_d2
2164 +    .catch Landroid/os/RemoteException; {:try_start_50 .. :try_end_57} :catch_dd
2165 +
2166 +    :cond_57
2167 +    :goto_57
2168 +    and-int/lit8 v10, p3, 0x8
2169 +
2170 +    if-eqz v10, :cond_62
2171 +
2172 +    :try_start_5b
2173 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2174 +
2175 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallForwarding:Z
2176 +
2177 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
2178 +    :try_end_62
2179 +    .catchall {:try_start_5b .. :try_end_62} :catchall_d2
2180 +    .catch Landroid/os/RemoteException; {:try_start_5b .. :try_end_62} :catch_e5
2181 +
2182 +    :cond_62
2183 +    :goto_62
2184 +    and-int/lit8 v10, p3, 0x10
2185 +
2186 +    if-eqz v10, :cond_66
2187 +
2188 +    :cond_66
2189 +    and-int/lit8 v10, p3, 0x20
2190 +
2191 +    if-eqz v10, :cond_73
2192 +
2193 +    :try_start_6a
2194 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2195 +
2196 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallState:I
2197 +
2198 +    iget-object v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallIncomingNumber:Ljava/lang/String;
2199 +
2200 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
2201 +    :try_end_73
2202 +    .catchall {:try_start_6a .. :try_end_73} :catchall_d2
2203 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_73} :catch_ed
2204 +
2205 +    :cond_73
2206 +    :goto_73
2207 +    and-int/lit8 v10, p3, 0x40
2208 +
2209 +    if-eqz v10, :cond_80
2210 +
2211 +    :try_start_77
2212 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2213 +
2214 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionState:I
2215 +
2216 +    iget v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionNetworkType:I
2217 +
2218 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
2219 +    :try_end_80
2220 +    .catchall {:try_start_77 .. :try_end_80} :catchall_d2
2221 +    .catch Landroid/os/RemoteException; {:try_start_77 .. :try_end_80} :catch_f4
2222 +
2223 +    :cond_80
2224 +    :goto_80
2225 +    move/from16 v0, p3
2226 +
2227 +    and-int/lit16 v10, v0, 0x80
2228 +
2229 +    if-eqz v10, :cond_8d
2230 +
2231 +    :try_start_86
2232 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2233 +
2234 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataActivity:I
2235 +
2236 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
2237 +    :try_end_8d
2238 +    .catchall {:try_start_86 .. :try_end_8d} :catchall_d2
2239 +    .catch Landroid/os/RemoteException; {:try_start_86 .. :try_end_8d} :catch_fb
2240 +
2241 +    :cond_8d
2242 +    :goto_8d
2243 +    move/from16 v0, p3
2244 +
2245 +    and-int/lit16 v10, v0, 0x100
2246 +
2247 +    if-eqz v10, :cond_9a
2248 +
2249 +    :try_start_93
2250 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2251 +
2252 +    iget-object v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2253 +
2254 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
2255 +    :try_end_9a
2256 +    .catchall {:try_start_93 .. :try_end_9a} :catchall_d2
2257 +    .catch Landroid/os/RemoteException; {:try_start_93 .. :try_end_9a} :catch_102
2258 +
2259 +    :cond_9a
2260 +    :goto_9a
2261 +    move/from16 v0, p3
2262 +
2263 +    and-int/lit16 v10, v0, 0x200
2264 +
2265 +    if-eqz v10, :cond_a7
2266 +
2267 +    :try_start_a0
2268 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2269 +
2270 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mOtaspMode:I
2271 +
2272 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
2273 +    :try_end_a7
2274 +    .catchall {:try_start_a0 .. :try_end_a7} :catchall_d2
2275 +    .catch Landroid/os/RemoteException; {:try_start_a0 .. :try_end_a7} :catch_109
2276 +
2277 +    :cond_a7
2278 +    :goto_a7
2279 +    move/from16 v0, p3
2280 +
2281 +    and-int/lit16 v10, v0, 0x400
2282 +
2283 +    if-eqz v10, :cond_ad
2284 +
2285 +    :cond_ad
2286 +    :try_start_ad
2287 +    monitor-exit v11
2288 +    :try_end_ae
2289 +    .catchall {:try_start_ad .. :try_end_ae} :catchall_d2
2290 +
2291 +    :goto_ae
2292 +    return-void
2293 +
2294 +    :catch_af
2295 +    move-exception v3
2296 +
2297 +    const-string v10, "PrivacyTelephonyRegistry"
2298 +
2299 +    const-string v11, "failed to register privacy broadcastreceiver"
2300 +
2301 +    invoke-static {v10, v11}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2302 +
2303 +    goto/16 :goto_3
2304 +
2305 +    :cond_b9
2306 +    add-int/lit8 v6, v6, 0x1
2307 +
2308 +    move-object v8, v7
2309 +
2310 +    goto/16 :goto_1a
2311 +
2312 +    :cond_be
2313 +    :try_start_be
2314 +    new-instance v7, Lcom/android/server/TelephonyRegistry$Record;
2315 +
2316 +    invoke-direct {v7}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
2317 +    :try_end_c3
2318 +    .catchall {:try_start_be .. :try_end_c3} :catchall_118
2319 +
2320 +    :try_start_c3
2321 +    iput-object v2, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2322 +
2323 +    move-object/from16 v0, p2
2324 +
2325 +    iput-object v0, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2326 +
2327 +    iput-object p1, v7, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2328 +
2329 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2330 +
2331 +    invoke-virtual {v10, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2332 +
2333 +    goto/16 :goto_28
2334 +
2335 +    :catchall_d2
2336 +    move-exception v10
2337 +
2338 +    :goto_d3
2339 +    monitor-exit v11
2340 +    :try_end_d4
2341 +    .catchall {:try_start_c3 .. :try_end_d4} :catchall_d2
2342 +
2343 +    throw v10
2344 +
2345 +    :catch_d5
2346 +    move-exception v4
2347 +
2348 +    :try_start_d6
2349 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2350 +
2351 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2352 +
2353 +    goto/16 :goto_4c
2354 +
2355 +    :catch_dd
2356 +    move-exception v4
2357 +
2358 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2359 +
2360 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2361 +
2362 +    goto/16 :goto_57
2363 +
2364 +    :catch_e5
2365 +    move-exception v4
2366 +
2367 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2368 +
2369 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2370 +
2371 +    goto/16 :goto_62
2372 +
2373 +    :catch_ed
2374 +    move-exception v4
2375 +
2376 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2377 +
2378 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2379 +
2380 +    goto :goto_73
2381 +
2382 +    :catch_f4
2383 +    move-exception v4
2384 +
2385 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2386 +
2387 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2388 +
2389 +    goto :goto_80
2390 +
2391 +    :catch_fb
2392 +    move-exception v4
2393 +
2394 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2395 +
2396 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2397 +
2398 +    goto :goto_8d
2399 +
2400 +    :catch_102
2401 +    move-exception v4
2402 +
2403 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2404 +
2405 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2406 +
2407 +    goto :goto_9a
2408 +
2409 +    :catch_109
2410 +    move-exception v4
2411 +
2412 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2413 +
2414 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2415 +    :try_end_10f
2416 +    .catchall {:try_start_d6 .. :try_end_10f} :catchall_d2
2417 +
2418 +    goto :goto_a7
2419 +
2420 +    :cond_110
2421 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2422 +
2423 +    move-result-object v10
2424 +
2425 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2426 +
2427 +    goto :goto_ae
2428 +
2429 +    :catchall_118
2430 +    move-exception v10
2431 +
2432 +    move-object v7, v8
2433 +
2434 +    goto :goto_d3
2435 +.end method
2436 +
2437 +.method public bridge synthetic notifyCallForwardingChanged(Z)V
2438 +    .registers 2
2439 +
2440 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyCallForwardingChanged(Z)V
2441 +
2442 +    return-void
2443 +.end method
2444 +
2445 +.method public bridge synthetic notifyCallState(ILjava/lang/String;)V
2446 +    .registers 3
2447 +
2448 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
2449 +
2450 +    return-void
2451 +.end method
2452 +
2453 +.method public notifyCellInfo(Landroid/telephony/CellInfo;)V
2454 +    .registers 24
2455 +
2456 +    const-string v2, "notifyCellInfo()"
2457 +
2458 +    move-object/from16 v0, p0
2459 +
2460 +    invoke-virtual {v0, v2}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2461 +
2462 +    move-result v2
2463 +
2464 +    if-nez v2, :cond_b
2465 +
2466 +    :goto_a
2467 +    return-void
2468 +
2469 +    :cond_b
2470 +    move-object/from16 v0, p0
2471 +
2472 +    iget-object v15, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2473 +
2474 +    monitor-enter v15
2475 +
2476 +    :try_start_10
2477 +    move-object/from16 v0, p1
2478 +
2479 +    move-object/from16 v1, p0
2480 +
2481 +    iput-object v0, v1, Lcom/android/server/PrivacyTelephonyRegistry;->mCellInfo:Landroid/telephony/CellInfo;
2482 +
2483 +    move-object/from16 v0, p0
2484 +
2485 +    iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2486 +
2487 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2488 +
2489 +    move-result-object v13
2490 +
2491 +    :cond_1e
2492 +    :goto_1e
2493 +    invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z
2494 +
2495 +    move-result v2
2496 +
2497 +    if-eqz v2, :cond_cb
2498 +
2499 +    invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2500 +
2501 +    move-result-object v14
2502 +
2503 +    check-cast v14, Lcom/android/server/TelephonyRegistry$Record;
2504 +
2505 +    iget v2, v14, Lcom/android/server/TelephonyRegistry$Record;->events:I
2506 +    :try_end_2c
2507 +    .catchall {:try_start_10 .. :try_end_2c} :catchall_9a
2508 +
2509 +    and-int/lit16 v2, v2, 0x400
2510 +
2511 +    if-eqz v2, :cond_1e
2512 +
2513 +    const/4 v2, 0x1
2514 +
2515 +    :try_start_31
2516 +    iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2517 +
2518 +    move-object/from16 v0, p0
2519 +
2520 +    invoke-direct {v0, v2, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2521 +
2522 +    move-result v2
2523 +
2524 +    if-nez v2, :cond_9d
2525 +
2526 +    iget-object v0, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2527 +
2528 +    move-object/from16 v16, v0
2529 +
2530 +    new-instance v17, Landroid/telephony/CellInfo;
2531 +
2532 +    const/4 v11, 0x0
2533 +
2534 +    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2535 +
2536 +    move-result-wide v18
2537 +
2538 +    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2539 +
2540 +    move-result-wide v20
2541 +
2542 +    const/4 v9, 0x1
2543 +
2544 +    new-instance v10, Landroid/telephony/SignalStrength;
2545 +
2546 +    invoke-direct {v10}, Landroid/telephony/SignalStrength;-><init>()V
2547 +
2548 +    new-instance v2, Landroid/telephony/GsmCellIdentity;
2549 +
2550 +    const/16 v3, 0xb
2551 +
2552 +    const/16 v4, 0xb
2553 +
2554 +    const/16 v5, 0x225
2555 +
2556 +    const/16 v6, 0x221
2557 +
2558 +    const/4 v7, 0x2
2559 +
2560 +    const-string v8, "unknown"
2561 +
2562 +    invoke-direct/range {v2 .. v8}, Landroid/telephony/GsmCellIdentity;-><init>(IIIIILjava/lang/String;)V
2563 +
2564 +    move-object/from16 v3, v17
2565 +
2566 +    move v4, v11
2567 +
2568 +    move-wide/from16 v5, v18
2569 +
2570 +    move-wide/from16 v7, v20
2571 +
2572 +    move-object v11, v2
2573 +
2574 +    invoke-direct/range {v3 .. v11}, Landroid/telephony/CellInfo;-><init>(IJJZLandroid/telephony/SignalStrength;Landroid/telephony/CellIdentity;)V
2575 +
2576 +    invoke-interface/range {v16 .. v17}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2577 +
2578 +    const-string v2, "PrivacyTelephonyRegistry"
2579 +
2580 +    new-instance v3, Ljava/lang/StringBuilder;
2581 +
2582 +    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2583 +
2584 +    const-string v4, "package: "
2585 +
2586 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2587 +
2588 +    move-result-object v3
2589 +
2590 +    iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2591 +
2592 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2593 +
2594 +    move-result-object v3
2595 +
2596 +    const-string v4, " blocked for Cellinfo"
2597 +
2598 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2599 +
2600 +    move-result-object v3
2601 +
2602 +    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2603 +
2604 +    move-result-object v3
2605 +
2606 +    invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2607 +    :try_end_8e
2608 +    .catchall {:try_start_31 .. :try_end_8e} :catchall_9a
2609 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_8e} :catch_8f
2610 +
2611 +    goto :goto_1e
2612 +
2613 +    :catch_8f
2614 +    move-exception v12
2615 +
2616 +    :try_start_90
2617 +    move-object/from16 v0, p0
2618 +
2619 +    iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2620 +
2621 +    iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2622 +
2623 +    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2624 +
2625 +    goto :goto_1e
2626 +
2627 +    :catchall_9a
2628 +    move-exception v2
2629 +
2630 +    monitor-exit v15
2631 +    :try_end_9c
2632 +    .catchall {:try_start_90 .. :try_end_9c} :catchall_9a
2633 +
2634 +    throw v2
2635 +
2636 +    :cond_9d
2637 +    :try_start_9d
2638 +    iget-object v2, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2639 +
2640 +    new-instance v3, Landroid/telephony/CellInfo;
2641 +
2642 +    move-object/from16 v0, p1
2643 +
2644 +    invoke-direct {v3, v0}, Landroid/telephony/CellInfo;-><init>(Landroid/telephony/CellInfo;)V
2645 +
2646 +    invoke-interface {v2, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2647 +
2648 +    const-string v2, "PrivacyTelephonyRegistry"
2649 +
2650 +    new-instance v3, Ljava/lang/StringBuilder;
2651 +
2652 +    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2653 +
2654 +    const-string v4, "package: "
2655 +
2656 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2657 +
2658 +    move-result-object v3
2659 +
2660 +    iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2661 +
2662 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2663 +
2664 +    move-result-object v3
2665 +
2666 +    const-string v4, " allowed for Cellinfo"
2667 +
2668 +    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2669 +
2670 +    move-result-object v3
2671 +
2672 +    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2673 +
2674 +    move-result-object v3
2675 +
2676 +    invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2677 +    :try_end_c9
2678 +    .catchall {:try_start_9d .. :try_end_c9} :catchall_9a
2679 +    .catch Landroid/os/RemoteException; {:try_start_9d .. :try_end_c9} :catch_8f
2680 +
2681 +    goto/16 :goto_1e
2682 +
2683 +    :cond_cb
2684 +    :try_start_cb
2685 +    invoke-virtual/range {p0 .. p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2686 +
2687 +    monitor-exit v15
2688 +    :try_end_cf
2689 +    .catchall {:try_start_cb .. :try_end_cf} :catchall_9a
2690 +
2691 +    goto/16 :goto_a
2692 +.end method
2693 +
2694 +.method public notifyCellLocation(Landroid/os/Bundle;)V
2695 +    .registers 14
2696 +
2697 +    const-string v8, "notifyCellLocation()"
2698 +
2699 +    invoke-virtual {p0, v8}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2700 +
2701 +    move-result v8
2702 +
2703 +    if-nez v8, :cond_9
2704 +
2705 +    :goto_8
2706 +    return-void
2707 +
2708 +    :cond_9
2709 +    iget-object v9, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2710 +
2711 +    monitor-enter v9
2712 +
2713 +    :try_start_c
2714 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
2715 +    :try_end_e
2716 +    .catchall {:try_start_c .. :try_end_e} :catchall_7f
2717 +
2718 +    const/4 v4, 0x0
2719 +
2720 +    const/4 v2, 0x0
2721 +
2722 +    :try_start_10
2723 +    const-string v8, "lac"
2724 +
2725 +    invoke-virtual {p1, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
2726 +    :try_end_15
2727 +    .catchall {:try_start_10 .. :try_end_15} :catchall_7f
2728 +    .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_15} :catch_84
2729 +
2730 +    move-result v8
2731 +
2732 +    if-eqz v8, :cond_82
2733 +
2734 +    const/4 v4, 0x0
2735 +
2736 +    :goto_19
2737 +    :try_start_19
2738 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2739 +
2740 +    invoke-virtual {v8}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2741 +
2742 +    move-result-object v3
2743 +
2744 +    :cond_1f
2745 +    :goto_1f
2746 +    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2747 +
2748 +    move-result v8
2749 +
2750 +    if-eqz v8, :cond_bc
2751 +
2752 +    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2753 +
2754 +    move-result-object v6
2755 +
2756 +    check-cast v6, Lcom/android/server/TelephonyRegistry$Record;
2757 +
2758 +    iget v8, v6, Lcom/android/server/TelephonyRegistry$Record;->events:I
2759 +    :try_end_2d
2760 +    .catchall {:try_start_19 .. :try_end_2d} :catchall_7f
2761 +
2762 +    and-int/lit8 v8, v8, 0x10
2763 +
2764 +    if-eqz v8, :cond_1f
2765 +
2766 +    const/4 v8, 0x0
2767 +
2768 +    :try_start_32
2769 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2770 +
2771 +    invoke-direct {p0, v8, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2772 +
2773 +    move-result v8
2774 +
2775 +    if-nez v8, :cond_90
2776 +
2777 +    if-nez v2, :cond_90
2778 +
2779 +    new-instance v5, Landroid/os/Bundle;
2780 +
2781 +    invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
2782 +
2783 +    if-eqz v4, :cond_87
2784 +
2785 +    new-instance v7, Landroid/telephony/cdma/CdmaCellLocation;
2786 +
2787 +    invoke-direct {v7}, Landroid/telephony/cdma/CdmaCellLocation;-><init>()V
2788 +
2789 +    invoke-virtual {v7, v5}, Landroid/telephony/cdma/CdmaCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2790 +
2791 +    :goto_4b
2792 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2793 +
2794 +    new-instance v10, Landroid/os/Bundle;
2795 +
2796 +    invoke-direct {v10, v5}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2797 +
2798 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2799 +
2800 +    const-string v8, "PrivacyTelephonyRegistry"
2801 +
2802 +    new-instance v10, Ljava/lang/StringBuilder;
2803 +
2804 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2805 +
2806 +    const-string v11, "package: "
2807 +
2808 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2809 +
2810 +    move-result-object v10
2811 +
2812 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2813 +
2814 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2815 +
2816 +    move-result-object v10
2817 +
2818 +    const-string v11, " blocked for CellLocation"
2819 +
2820 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2821 +
2822 +    move-result-object v10
2823 +
2824 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2825 +
2826 +    move-result-object v10
2827 +
2828 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2829 +    :try_end_75
2830 +    .catchall {:try_start_32 .. :try_end_75} :catchall_7f
2831 +    .catch Landroid/os/RemoteException; {:try_start_32 .. :try_end_75} :catch_76
2832 +
2833 +    goto :goto_1f
2834 +
2835 +    :catch_76
2836 +    move-exception v1
2837 +
2838 +    :try_start_77
2839 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2840 +
2841 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2842 +
2843 +    invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2844 +
2845 +    goto :goto_1f
2846 +
2847 +    :catchall_7f
2848 +    move-exception v8
2849 +
2850 +    monitor-exit v9
2851 +    :try_end_81
2852 +    .catchall {:try_start_77 .. :try_end_81} :catchall_7f
2853 +
2854 +    throw v8
2855 +
2856 +    :cond_82
2857 +    const/4 v4, 0x1
2858 +
2859 +    goto :goto_19
2860 +
2861 +    :catch_84
2862 +    move-exception v0
2863 +
2864 +    const/4 v2, 0x1
2865 +
2866 +    goto :goto_19
2867 +
2868 +    :cond_87
2869 +    :try_start_87
2870 +    new-instance v7, Landroid/telephony/gsm/GsmCellLocation;
2871 +
2872 +    invoke-direct {v7}, Landroid/telephony/gsm/GsmCellLocation;-><init>()V
2873 +
2874 +    invoke-virtual {v7, v5}, Landroid/telephony/gsm/GsmCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2875 +
2876 +    goto :goto_4b
2877 +
2878 +    :cond_90
2879 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2880 +
2881 +    new-instance v10, Landroid/os/Bundle;
2882 +
2883 +    invoke-direct {v10, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2884 +
2885 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2886 +
2887 +    const-string v8, "PrivacyTelephonyRegistry"
2888 +
2889 +    new-instance v10, Ljava/lang/StringBuilder;
2890 +
2891 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2892 +
2893 +    const-string v11, "package: "
2894 +
2895 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2896 +
2897 +    move-result-object v10
2898 +
2899 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2900 +
2901 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2902 +
2903 +    move-result-object v10
2904 +
2905 +    const-string v11, " allowed for CellLocation"
2906 +
2907 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2908 +
2909 +    move-result-object v10
2910 +
2911 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2912 +
2913 +    move-result-object v10
2914 +
2915 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2916 +    :try_end_ba
2917 +    .catchall {:try_start_87 .. :try_end_ba} :catchall_7f
2918 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_ba} :catch_76
2919 +
2920 +    goto/16 :goto_1f
2921 +
2922 +    :cond_bc
2923 +    :try_start_bc
2924 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2925 +
2926 +    monitor-exit v9
2927 +    :try_end_c0
2928 +    .catchall {:try_start_bc .. :try_end_c0} :catchall_7f
2929 +
2930 +    goto/16 :goto_8
2931 +.end method
2932 +
2933 +.method public bridge synthetic notifyDataActivity(I)V
2934 +    .registers 2
2935 +
2936 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyDataActivity(I)V
2937 +
2938 +    return-void
2939 +.end method
2940 +
2941 +.method public bridge synthetic notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2942 +    .registers 10
2943 +
2944 +    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
2945 +
2946 +    return-void
2947 +.end method
2948 +
2949 +.method public bridge synthetic notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2950 +    .registers 3
2951 +
2952 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2953 +
2954 +    return-void
2955 +.end method
2956 +
2957 +.method public bridge synthetic notifyMessageWaitingChanged(Z)V
2958 +    .registers 2
2959 +
2960 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyMessageWaitingChanged(Z)V
2961 +
2962 +    return-void
2963 +.end method
2964 +
2965 +.method public bridge synthetic notifyOtaspChanged(I)V
2966 +    .registers 2
2967 +
2968 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyOtaspChanged(I)V
2969 +
2970 +    return-void
2971 +.end method
2972 +
2973 +.method public notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
2974 +    .registers 10
2975 +
2976 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2977 +
2978 +    monitor-enter v4
2979 +
2980 +    :try_start_3
2981 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2982 +
2983 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2984 +
2985 +    move-result-object v1
2986 +
2987 +    :cond_9
2988 +    :goto_9
2989 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
2990 +
2991 +    move-result v3
2992 +
2993 +    if-eqz v3, :cond_35
2994 +
2995 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2996 +
2997 +    move-result-object v2
2998 +
2999 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3000 +
3001 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3002 +    :try_end_17
3003 +    .catchall {:try_start_3 .. :try_end_17} :catchall_32
3004 +
3005 +    and-int/lit8 v3, v3, 0x20
3006 +
3007 +    if-eqz v3, :cond_9
3008 +
3009 +    :try_start_1b
3010 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3011 +
3012 +    invoke-virtual {v3, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
3013 +
3014 +    move-result v3
3015 +
3016 +    if-eqz v3, :cond_9
3017 +
3018 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3019 +
3020 +    invoke-interface {v3, p1, p2}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
3021 +    :try_end_28
3022 +    .catchall {:try_start_1b .. :try_end_28} :catchall_32
3023 +    .catch Landroid/os/RemoteException; {:try_start_1b .. :try_end_28} :catch_29
3024 +
3025 +    goto :goto_9
3026 +
3027 +    :catch_29
3028 +    move-exception v0
3029 +
3030 +    :try_start_2a
3031 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3032 +
3033 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3034 +
3035 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3036 +
3037 +    goto :goto_9
3038 +
3039 +    :catchall_32
3040 +    move-exception v3
3041 +
3042 +    monitor-exit v4
3043 +    :try_end_34
3044 +    .catchall {:try_start_2a .. :try_end_34} :catchall_32
3045 +
3046 +    throw v3
3047 +
3048 +    :cond_35
3049 +    :try_start_35
3050 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3051 +
3052 +    monitor-exit v4
3053 +    :try_end_39
3054 +    .catchall {:try_start_35 .. :try_end_39} :catchall_32
3055 +
3056 +    return-void
3057 +.end method
3058 +
3059 +.method public notifyServiceState(Landroid/telephony/ServiceState;)V
3060 +    .registers 9
3061 +
3062 +    const-string v3, "notifyServiceState()"
3063 +
3064 +    invoke-virtual {p0, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
3065 +
3066 +    move-result v3
3067 +
3068 +    if-nez v3, :cond_9
3069 +
3070 +    :goto_8
3071 +    return-void
3072 +
3073 +    :cond_9
3074 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3075 +
3076 +    monitor-enter v4
3077 +
3078 +    :try_start_c
3079 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
3080 +
3081 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3082 +
3083 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3084 +
3085 +    move-result-object v1
3086 +
3087 +    :cond_14
3088 +    :goto_14
3089 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3090 +
3091 +    move-result v3
3092 +
3093 +    if-eqz v3, :cond_90
3094 +
3095 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3096 +
3097 +    move-result-object v2
3098 +
3099 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3100 +
3101 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3102 +    :try_end_22
3103 +    .catchall {:try_start_c .. :try_end_22} :catchall_6c
3104 +
3105 +    and-int/lit8 v3, v3, 0x1
3106 +
3107 +    if-eqz v3, :cond_14
3108 +
3109 +    const/4 v3, 0x4
3110 +
3111 +    :try_start_27
3112 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3113 +
3114 +    invoke-direct {p0, v3, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
3115 +
3116 +    move-result v3
3117 +
3118 +    if-nez v3, :cond_6f
3119 +
3120 +    const-string v3, ""
3121 +
3122 +    const-string v5, ""
3123 +
3124 +    const-string v6, ""
3125 +
3126 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
3127 +
3128 +    const-string v3, "PrivacyTelephonyRegistry"
3129 +
3130 +    new-instance v5, Ljava/lang/StringBuilder;
3131 +
3132 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3133 +
3134 +    const-string v6, "package: "
3135 +
3136 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3137 +
3138 +    move-result-object v5
3139 +
3140 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3141 +
3142 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3143 +
3144 +    move-result-object v5
3145 +
3146 +    const-string v6, " blocked for Cellinfo"
3147 +
3148 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3149 +
3150 +    move-result-object v5
3151 +
3152 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3153 +
3154 +    move-result-object v5
3155 +
3156 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3157 +
3158 +    :goto_58
3159 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3160 +
3161 +    new-instance v5, Landroid/telephony/ServiceState;
3162 +
3163 +    invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
3164 +
3165 +    invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
3166 +    :try_end_62
3167 +    .catchall {:try_start_27 .. :try_end_62} :catchall_6c
3168 +    .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_62} :catch_63
3169 +
3170 +    goto :goto_14
3171 +
3172 +    :catch_63
3173 +    move-exception v0
3174 +
3175 +    :try_start_64
3176 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3177 +
3178 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3179 +
3180 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3181 +
3182 +    goto :goto_14
3183 +
3184 +    :catchall_6c
3185 +    move-exception v3
3186 +
3187 +    monitor-exit v4
3188 +    :try_end_6e
3189 +    .catchall {:try_start_64 .. :try_end_6e} :catchall_6c
3190 +
3191 +    throw v3
3192 +
3193 +    :cond_6f
3194 +    :try_start_6f
3195 +    const-string v3, "PrivacyTelephonyRegistry"
3196 +
3197 +    new-instance v5, Ljava/lang/StringBuilder;
3198 +
3199 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3200 +
3201 +    const-string v6, "package: "
3202 +
3203 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3204 +
3205 +    move-result-object v5
3206 +
3207 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3208 +
3209 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3210 +
3211 +    move-result-object v5
3212 +
3213 +    const-string v6, " allowed for Cellinfo"
3214 +
3215 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3216 +
3217 +    move-result-object v5
3218 +
3219 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3220 +
3221 +    move-result-object v5
3222 +
3223 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3224 +    :try_end_8f
3225 +    .catchall {:try_start_6f .. :try_end_8f} :catchall_6c
3226 +    .catch Landroid/os/RemoteException; {:try_start_6f .. :try_end_8f} :catch_63
3227 +
3228 +    goto :goto_58
3229 +
3230 +    :cond_90
3231 +    :try_start_90
3232 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3233 +
3234 +    monitor-exit v4
3235 +    :try_end_94
3236 +    .catchall {:try_start_90 .. :try_end_94} :catchall_6c
3237 +
3238 +    invoke-virtual {p0, p1}, Lcom/android/server/PrivacyTelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
3239 +
3240 +    goto/16 :goto_8
3241 +.end method
3242 +
3243 +.method public bridge synthetic notifySignalStrength(Landroid/telephony/SignalStrength;)V
3244 +    .registers 2
3245 +
3246 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifySignalStrength(Landroid/telephony/SignalStrength;)V
3247 +
3248 +    return-void
3249 +.end method
3250 diff -Npru stock-services/smali/com/android/server/ServerThread.smali ext-services/smali/com/android/server/ServerThread.smali
3251 --- stock-services/smali/com/android/server/ServerThread.smali  2012-10-19 15:30:51.833516136 -0500
3252 +++ ext-services/smali/com/android/server/ServerThread.smali    2012-10-19 15:30:39.729456116 -0500
3253 @@ -24,6 +24,41 @@
3254      return-void
3255  .end method
3256
3257 +.method private addPrivacyService(Landroid/content/Context;)V
3258 +    .registers 5
3259 +
3260 +    :try_start_0
3261 +    const-string v1, "SystemServer"
3262 +
3263 +    const-string v2, "Privacy Service"
3264 +
3265 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3266 +
3267 +    const-string v1, "privacy"
3268 +
3269 +    new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
3270 +
3271 +    invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
3272 +
3273 +    invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3274 +    :try_end_11
3275 +    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
3276 +
3277 +    :goto_11
3278 +    return-void
3279 +
3280 +    :catch_12
3281 +    move-exception v0
3282 +
3283 +    const-string v1, "SystemServer"
3284 +
3285 +    const-string v2, "Failure starting Privacy Service"
3286 +
3287 +    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3288 +
3289 +    goto :goto_11
3290 +.end method
3291 +
3292  .method static final startSystemUi(Landroid/content/Context;)V
3293      .registers 5
3294
3295 @@ -155,7 +190,7 @@
3296
3297      const/16 v9, 0x31
3298
3299 -    if-ne v3, v9, :cond_66f
3300 +    if-ne v3, v9, :cond_674
3301
3302      const/16 v93, 0x1
3303
3304 @@ -166,7 +201,7 @@
3305
3306      const/4 v9, 0x1
3307
3308 -    if-le v3, v9, :cond_673
3309 +    if-le v3, v9, :cond_678
3310
3311      const/4 v3, 0x1
3312
3313 @@ -202,7 +237,7 @@
3314
3315      move-result v3
3316
3317 -    if-eqz v3, :cond_677
3318 +    if-eqz v3, :cond_67c
3319
3320      const/16 v68, 0x0
3321
3322 @@ -302,7 +337,7 @@
3323
3324      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3325      :try_end_c0
3326 -    .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_9e7
3327 +    .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_9ec
3328
3329      :try_start_c0
3330      const-string v3, "power"
3331 @@ -327,9 +362,9 @@
3332
3333      const-string v3, "telephony.registry"
3334
3335 -    new-instance v9, Lcom/android/server/TelephonyRegistry;
3336 +    new-instance v9, Lcom/android/server/PrivacyTelephonyRegistry;
3337
3338 -    invoke-direct {v9, v4}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
3339 +    invoke-direct {v9, v4}, Lcom/android/server/PrivacyTelephonyRegistry;-><init>(Landroid/content/Context;)V
3340
3341      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3342
3343 @@ -371,7 +406,7 @@
3344
3345      move-result v3
3346
3347 -    if-eqz v3, :cond_67d
3348 +    if-eqz v3, :cond_682
3349
3350      const-string v3, "SystemServer"
3351
3352 @@ -383,7 +418,7 @@
3353
3354      :cond_117
3355      :goto_117
3356 -    if-eqz v68, :cond_692
3357 +    if-eqz v68, :cond_697
3358
3359      const/4 v3, 0x1
3360
3361 @@ -392,7 +427,7 @@
3362
3363      invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
3364      :try_end_11f
3365 -    .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6a1
3366 +    .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6a6
3367
3368      move-result-object v90
3369
3370 @@ -401,8 +436,8 @@
3371      :try_start_122
3372      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3373      :try_end_125
3374 -    .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_97c
3375 -    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6a1
3376 +    .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_981
3377 +    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6a6
3378
3379      move-result v70
3380
3381 @@ -418,7 +453,7 @@
3382
3383      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3384      :try_end_131
3385 -    .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6a1
3386 +    .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6a6
3387
3388      :try_start_131
3389      const-string v3, "SystemServer"
3390 @@ -433,8 +468,8 @@
3391
3392      invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3393      :try_end_13f
3394 -    .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_695
3395 -    .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6a1
3396 +    .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_69a
3397 +    .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6a6
3398
3399      :try_start_13f
3400      const-string v3, "account"
3401 @@ -443,8 +478,8 @@
3402
3403      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3404      :try_end_146
3405 -    .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a26
3406 -    .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_9f0
3407 +    .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a2b
3408 +    .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_9f5
3409
3410      move-object/from16 v41, v42
3411
3412 @@ -460,7 +495,7 @@
3413
3414      move/from16 v0, v68
3415
3416 -    if-ne v0, v3, :cond_6b8
3417 +    if-ne v0, v3, :cond_6bd
3418
3419      const/4 v3, 0x1
3420
3421 @@ -469,6 +504,10 @@
3422
3423      move-result-object v57
3424
3425 +    move-object/from16 v0, p0
3426 +
3427 +    invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
3428 +
3429      const-string v3, "SystemServer"
3430
3431      const-string v9, "System Content Providers"
3432 @@ -488,10 +527,10 @@
3433      move-object/from16 v0, v75
3434
3435      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3436 -    :try_end_171
3437 -    .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_171} :catch_6a1
3438 +    :try_end_176
3439 +    .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_176} :catch_6a6
3440
3441 -    :try_start_171
3442 +    :try_start_176
3443      const-string v3, "SystemServer"
3444
3445      const-string v9, "Battery Service"
3446 @@ -503,10 +542,10 @@
3447      move-object/from16 v0, v75
3448
3449      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3450 -    :try_end_17f
3451 -    .catch Ljava/lang/RuntimeException; {:try_start_171 .. :try_end_17f} :catch_9f9
3452 +    :try_end_184
3453 +    .catch Ljava/lang/RuntimeException; {:try_start_176 .. :try_end_184} :catch_9fe
3454
3455 -    :try_start_17f
3456 +    :try_start_184
3457      const-string v3, "battery"
3458
3459      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3460 @@ -522,10 +561,10 @@
3461      move-object/from16 v0, v111
3462
3463      invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3464 -    :try_end_192
3465 -    .catch Ljava/lang/RuntimeException; {:try_start_17f .. :try_end_192} :catch_a02
3466 +    :try_end_197
3467 +    .catch Ljava/lang/RuntimeException; {:try_start_184 .. :try_end_197} :catch_a07
3468
3469 -    :try_start_192
3470 +    :try_start_197
3471      const-string v3, "vibrator"
3472
3473      move-object/from16 v0, v111
3474 @@ -549,10 +588,10 @@
3475      new-instance v7, Lcom/android/server/AlarmManagerService;
3476
3477      invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
3478 -    :try_end_1ae
3479 -    .catch Ljava/lang/RuntimeException; {:try_start_192 .. :try_end_1ae} :catch_a09
3480 +    :try_end_1b3
3481 +    .catch Ljava/lang/RuntimeException; {:try_start_197 .. :try_end_1b3} :catch_a0e
3482
3483 -    :try_start_1ae
3484 +    :try_start_1b3
3485      const-string v3, "alarm"
3486
3487      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3488 @@ -583,18 +622,18 @@
3489
3490      move/from16 v0, v68
3491
3492 -    if-eq v0, v3, :cond_6bb
3493 +    if-eq v0, v3, :cond_6c0
3494
3495      const/4 v3, 0x1
3496
3497      move v9, v3
3498
3499 -    :goto_1d3
3500 -    if-nez v70, :cond_6bf
3501 +    :goto_1d8
3502 +    if-nez v70, :cond_6c4
3503
3504      const/4 v3, 0x1
3505
3506 -    :goto_1d6
3507 +    :goto_1db
3508      move/from16 v0, v89
3509
3510      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;
3511 @@ -637,22 +676,22 @@
3512
3513      move-result v3
3514
3515 -    if-eqz v3, :cond_6c2
3516 +    if-eqz v3, :cond_6c7
3517
3518      const-string v3, "SystemServer"
3519
3520      const-string v9, "No Bluetooh Service (emulator)"
3521
3522      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3523 -    :try_end_20c
3524 -    .catch Ljava/lang/RuntimeException; {:try_start_1ae .. :try_end_20c} :catch_6d0
3525 +    :try_end_211
3526 +    .catch Ljava/lang/RuntimeException; {:try_start_1b3 .. :try_end_211} :catch_6d5
3527
3528 -    :goto_20c
3529 +    :goto_211
3530      move-object/from16 v110, v111
3531
3532      move-object/from16 v74, v75
3533
3534 -    :goto_210
3535 +    :goto_215
3536      const/16 v61, 0x0
3537
3538      const/16 v100, 0x0
3539 @@ -679,9 +718,9 @@
3540
3541      move/from16 v0, v68
3542
3543 -    if-eq v0, v3, :cond_255
3544 +    if-eq v0, v3, :cond_25a
3545
3546 -    :try_start_22b
3547 +    :try_start_230
3548      const-string v3, "SystemServer"
3549
3550      const-string v9, "Input Method Service"
3551 @@ -695,22 +734,22 @@
3552      move-object/from16 v1, v119
3553
3554      invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3555 -    :try_end_23b
3556 -    .catch Ljava/lang/Throwable; {:try_start_22b .. :try_end_23b} :catch_725
3557 +    :try_end_240
3558 +    .catch Ljava/lang/Throwable; {:try_start_230 .. :try_end_240} :catch_72a
3559
3560 -    :try_start_23b
3561 +    :try_start_240
3562      const-string v3, "input_method"
3563
3564      move-object/from16 v0, v72
3565
3566      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3567 -    :try_end_242
3568 -    .catch Ljava/lang/Throwable; {:try_start_23b .. :try_end_242} :catch_9e2
3569 +    :try_end_247
3570 +    .catch Ljava/lang/Throwable; {:try_start_240 .. :try_end_247} :catch_9e7
3571
3572      move-object/from16 v71, v72
3573
3574 -    :goto_244
3575 -    :try_start_244
3576 +    :goto_249
3577 +    :try_start_249
3578      const-string v3, "SystemServer"
3579
3580      const-string v9, "Accessibility Manager"
3581 @@ -724,24 +763,24 @@
3582      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
3583
3584      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3585 -    :try_end_255
3586 -    .catch Ljava/lang/Throwable; {:try_start_244 .. :try_end_255} :catch_731
3587 +    :try_end_25a
3588 +    .catch Ljava/lang/Throwable; {:try_start_249 .. :try_end_25a} :catch_736
3589
3590 -    :cond_255
3591 -    :goto_255
3592 -    :try_start_255
3593 +    :cond_25a
3594 +    :goto_25a
3595 +    :try_start_25a
3596      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3597 -    :try_end_258
3598 -    .catch Ljava/lang/Throwable; {:try_start_255 .. :try_end_258} :catch_73d
3599 +    :try_end_25d
3600 +    .catch Ljava/lang/Throwable; {:try_start_25a .. :try_end_25d} :catch_742
3601
3602 -    :goto_258
3603 -    :try_start_258
3604 +    :goto_25d
3605 +    :try_start_25d
3606      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3607 -    :try_end_25b
3608 -    .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_25b} :catch_749
3609 +    :try_end_260
3610 +    .catch Ljava/lang/Throwable; {:try_start_25d .. :try_end_260} :catch_74e
3611
3612 -    :goto_25b
3613 -    :try_start_25b
3614 +    :goto_260
3615 +    :try_start_260
3616      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3617
3618      move-result-object v3
3619 @@ -759,15 +798,15 @@
3620      const/4 v10, 0x0
3621
3622      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3623 -    :try_end_26e
3624 -    .catch Landroid/os/RemoteException; {:try_start_25b .. :try_end_26e} :catch_9df
3625 +    :try_end_273
3626 +    .catch Landroid/os/RemoteException; {:try_start_260 .. :try_end_273} :catch_9e4
3627
3628 -    :goto_26e
3629 +    :goto_273
3630      const/4 v3, 0x1
3631
3632      move/from16 v0, v68
3633
3634 -    if-eq v0, v3, :cond_a2b
3635 +    if-eq v0, v3, :cond_a30
3636
3637      const/16 v81, 0x0
3638
3639 @@ -783,9 +822,9 @@
3640
3641      move-result v3
3642
3643 -    if-nez v3, :cond_29a
3644 +    if-nez v3, :cond_29f
3645
3646 -    :try_start_283
3647 +    :try_start_288
3648      const-string v3, "SystemServer"
3649
3650      const-string v9, "Mount Service"
3651 @@ -797,23 +836,23 @@
3652      move-object/from16 v0, v82
3653
3654      invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3655 -    :try_end_291
3656 -    .catch Ljava/lang/Throwable; {:try_start_283 .. :try_end_291} :catch_755
3657 +    :try_end_296
3658 +    .catch Ljava/lang/Throwable; {:try_start_288 .. :try_end_296} :catch_75a
3659
3660 -    :try_start_291
3661 +    :try_start_296
3662      const-string v3, "mount"
3663
3664      move-object/from16 v0, v82
3665
3666      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3667 -    :try_end_298
3668 -    .catch Ljava/lang/Throwable; {:try_start_291 .. :try_end_298} :catch_9da
3669 +    :try_end_29d
3670 +    .catch Ljava/lang/Throwable; {:try_start_296 .. :try_end_29d} :catch_9df
3671
3672      move-object/from16 v81, v82
3673
3674 -    :cond_29a
3675 -    :goto_29a
3676 -    :try_start_29a
3677 +    :cond_29f
3678 +    :goto_29f
3679 +    :try_start_29f
3680      const-string v3, "SystemServer"
3681
3682      const-string v9, "LockSettingsService"
3683 @@ -825,22 +864,22 @@
3684      move-object/from16 v0, v79
3685
3686      invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3687 -    :try_end_2a8
3688 -    .catch Ljava/lang/Throwable; {:try_start_29a .. :try_end_2a8} :catch_761
3689 +    :try_end_2ad
3690 +    .catch Ljava/lang/Throwable; {:try_start_29f .. :try_end_2ad} :catch_766
3691
3692 -    :try_start_2a8
3693 +    :try_start_2ad
3694      const-string v3, "lock_settings"
3695
3696      move-object/from16 v0, v79
3697
3698      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3699 -    :try_end_2af
3700 -    .catch Ljava/lang/Throwable; {:try_start_2a8 .. :try_end_2af} :catch_9d5
3701 +    :try_end_2b4
3702 +    .catch Ljava/lang/Throwable; {:try_start_2ad .. :try_end_2b4} :catch_9da
3703
3704      move-object/from16 v78, v79
3705
3706 -    :goto_2b1
3707 -    :try_start_2b1
3708 +    :goto_2b6
3709 +    :try_start_2b6
3710      const-string v3, "SystemServer"
3711
3712      const-string v9, "Device Policy"
3713 @@ -852,22 +891,22 @@
3714      move-object/from16 v0, v62
3715
3716      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3717 -    :try_end_2bf
3718 -    .catch Ljava/lang/Throwable; {:try_start_2b1 .. :try_end_2bf} :catch_76d
3719 +    :try_end_2c4
3720 +    .catch Ljava/lang/Throwable; {:try_start_2b6 .. :try_end_2c4} :catch_772
3721
3722 -    :try_start_2bf
3723 +    :try_start_2c4
3724      const-string v3, "device_policy"
3725
3726      move-object/from16 v0, v62
3727
3728      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3729 -    :try_end_2c6
3730 -    .catch Ljava/lang/Throwable; {:try_start_2bf .. :try_end_2c6} :catch_9d0
3731 +    :try_end_2cb
3732 +    .catch Ljava/lang/Throwable; {:try_start_2c4 .. :try_end_2cb} :catch_9d5
3733
3734      move-object/from16 v61, v62
3735
3736 -    :goto_2c8
3737 -    :try_start_2c8
3738 +    :goto_2cd
3739 +    :try_start_2cd
3740      const-string v3, "SystemServer"
3741
3742      const-string v9, "Status Bar"
3743 @@ -881,22 +920,22 @@
3744      move-object/from16 v1, v119
3745
3746      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3747 -    :try_end_2d8
3748 -    .catch Ljava/lang/Throwable; {:try_start_2c8 .. :try_end_2d8} :catch_779
3749 +    :try_end_2dd
3750 +    .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2dd} :catch_77e
3751
3752 -    :try_start_2d8
3753 +    :try_start_2dd
3754      const-string v3, "statusbar"
3755
3756      move-object/from16 v0, v101
3757
3758      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3759 -    :try_end_2df
3760 -    .catch Ljava/lang/Throwable; {:try_start_2d8 .. :try_end_2df} :catch_9cb
3761 +    :try_end_2e4
3762 +    .catch Ljava/lang/Throwable; {:try_start_2dd .. :try_end_2e4} :catch_9d0
3763
3764      move-object/from16 v100, v101
3765
3766 -    :goto_2e1
3767 -    :try_start_2e1
3768 +    :goto_2e6
3769 +    :try_start_2e6
3770      const-string v3, "SystemServer"
3771
3772      const-string v9, "Clipboard Service"
3773 @@ -910,11 +949,11 @@
3774      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
3775
3776      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3777 -    :try_end_2f2
3778 -    .catch Ljava/lang/Throwable; {:try_start_2e1 .. :try_end_2f2} :catch_785
3779 +    :try_end_2f7
3780 +    .catch Ljava/lang/Throwable; {:try_start_2e6 .. :try_end_2f7} :catch_78a
3781
3782 -    :goto_2f2
3783 -    :try_start_2f2
3784 +    :goto_2f7
3785 +    :try_start_2f7
3786      const-string v3, "SystemServer"
3787
3788      const-string v9, "NetworkManagement Service"
3789 @@ -928,11 +967,11 @@
3790      const-string v3, "network_management"
3791
3792      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3793 -    :try_end_302
3794 -    .catch Ljava/lang/Throwable; {:try_start_2f2 .. :try_end_302} :catch_791
3795 +    :try_end_307
3796 +    .catch Ljava/lang/Throwable; {:try_start_2f7 .. :try_end_307} :catch_796
3797
3798 -    :goto_302
3799 -    :try_start_302
3800 +    :goto_307
3801 +    :try_start_307
3802      const-string v3, "SystemServer"
3803
3804      const-string v9, "Text Service Manager Service"
3805 @@ -944,22 +983,22 @@
3806      move-object/from16 v0, v105
3807
3808      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3809 -    :try_end_310
3810 -    .catch Ljava/lang/Throwable; {:try_start_302 .. :try_end_310} :catch_79d
3811 +    :try_end_315
3812 +    .catch Ljava/lang/Throwable; {:try_start_307 .. :try_end_315} :catch_7a2
3813
3814 -    :try_start_310
3815 +    :try_start_315
3816      const-string v3, "textservices"
3817
3818      move-object/from16 v0, v105
3819
3820      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3821 -    :try_end_317
3822 -    .catch Ljava/lang/Throwable; {:try_start_310 .. :try_end_317} :catch_9c6
3823 +    :try_end_31c
3824 +    .catch Ljava/lang/Throwable; {:try_start_315 .. :try_end_31c} :catch_9cb
3825
3826      move-object/from16 v104, v105
3827
3828 -    :goto_319
3829 -    :try_start_319
3830 +    :goto_31e
3831 +    :try_start_31e
3832      const-string v3, "SystemServer"
3833
3834      const-string v9, "NetworkStats Service"
3835 @@ -971,22 +1010,22 @@
3836      move-object/from16 v0, v84
3837
3838      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
3839 -    :try_end_327
3840 -    .catch Ljava/lang/Throwable; {:try_start_319 .. :try_end_327} :catch_7a9
3841 +    :try_end_32c
3842 +    .catch Ljava/lang/Throwable; {:try_start_31e .. :try_end_32c} :catch_7ae
3843
3844 -    :try_start_327
3845 +    :try_start_32c
3846      const-string v3, "netstats"
3847
3848      move-object/from16 v0, v84
3849
3850      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3851 -    :try_end_32e
3852 -    .catch Ljava/lang/Throwable; {:try_start_327 .. :try_end_32e} :catch_9c1
3853 +    :try_end_333
3854 +    .catch Ljava/lang/Throwable; {:try_start_32c .. :try_end_333} :catch_9c6
3855
3856      move-object/from16 v12, v84
3857
3858 -    :goto_330
3859 -    :try_start_330
3860 +    :goto_335
3861 +    :try_start_335
3862      const-string v3, "SystemServer"
3863
3864      const-string v9, "NetworkPolicy Service"
3865 @@ -1004,18 +1043,18 @@
3866      move-object v11, v6
3867
3868      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
3869 -    :try_end_342
3870 -    .catch Ljava/lang/Throwable; {:try_start_330 .. :try_end_342} :catch_7b5
3871 +    :try_end_347
3872 +    .catch Ljava/lang/Throwable; {:try_start_335 .. :try_end_347} :catch_7ba
3873
3874 -    :try_start_342
3875 +    :try_start_347
3876      const-string v3, "netpolicy"
3877
3878      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3879 -    :try_end_347
3880 -    .catch Ljava/lang/Throwable; {:try_start_342 .. :try_end_347} :catch_9be
3881 +    :try_end_34c
3882 +    .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_34c} :catch_9c3
3883
3884 -    :goto_347
3885 -    :try_start_347
3886 +    :goto_34c
3887 +    :try_start_34c
3888      const-string v3, "SystemServer"
3889
3890      const-string v9, "Wi-Fi P2pService"
3891 @@ -1027,22 +1066,22 @@
3892      move-object/from16 v0, v118
3893
3894      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3895 -    :try_end_355
3896 -    .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_355} :catch_7c3
3897 +    :try_end_35a
3898 +    .catch Ljava/lang/Throwable; {:try_start_34c .. :try_end_35a} :catch_7c8
3899
3900 -    :try_start_355
3901 +    :try_start_35a
3902      const-string v3, "wifip2p"
3903
3904      move-object/from16 v0, v118
3905
3906      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3907 -    :try_end_35c
3908 -    .catch Ljava/lang/Throwable; {:try_start_355 .. :try_end_35c} :catch_9b9
3909 +    :try_end_361
3910 +    .catch Ljava/lang/Throwable; {:try_start_35a .. :try_end_361} :catch_9be
3911
3912      move-object/from16 v117, v118
3913
3914 -    :goto_35e
3915 -    :try_start_35e
3916 +    :goto_363
3917 +    :try_start_363
3918      const-string v3, "SystemServer"
3919
3920      const-string v9, "Wi-Fi Service"
3921 @@ -1054,22 +1093,22 @@
3922      move-object/from16 v0, v116
3923
3924      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3925 -    :try_end_36c
3926 -    .catch Ljava/lang/Throwable; {:try_start_35e .. :try_end_36c} :catch_7cf
3927 +    :try_end_371
3928 +    .catch Ljava/lang/Throwable; {:try_start_363 .. :try_end_371} :catch_7d4
3929
3930 -    :try_start_36c
3931 +    :try_start_371
3932      const-string v3, "wifi"
3933
3934      move-object/from16 v0, v116
3935
3936      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3937 -    :try_end_373
3938 -    .catch Ljava/lang/Throwable; {:try_start_36c .. :try_end_373} :catch_9b4
3939 +    :try_end_378
3940 +    .catch Ljava/lang/Throwable; {:try_start_371 .. :try_end_378} :catch_9b9
3941
3942      move-object/from16 v115, v116
3943
3944 -    :goto_375
3945 -    :try_start_375
3946 +    :goto_37a
3947 +    :try_start_37a
3948      const-string v3, "SystemServer"
3949
3950      const-string v9, "Connectivity Service"
3951 @@ -1081,10 +1120,10 @@
3952      move-object/from16 v0, v56
3953
3954      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
3955 -    :try_end_383
3956 -    .catch Ljava/lang/Throwable; {:try_start_375 .. :try_end_383} :catch_7db
3957 +    :try_end_388
3958 +    .catch Ljava/lang/Throwable; {:try_start_37a .. :try_end_388} :catch_7e0
3959
3960 -    :try_start_383
3961 +    :try_start_388
3962      const-string v3, "connectivity"
3963
3964      move-object/from16 v0, v56
3965 @@ -1102,13 +1141,13 @@
3966      invoke-virtual/range {v115 .. v115}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3967
3968      invoke-virtual/range {v117 .. v117}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3969 -    :try_end_39a
3970 -    .catch Ljava/lang/Throwable; {:try_start_383 .. :try_end_39a} :catch_9af
3971 +    :try_end_39f
3972 +    .catch Ljava/lang/Throwable; {:try_start_388 .. :try_end_39f} :catch_9b4
3973
3974      move-object/from16 v55, v56
3975
3976 -    :goto_39c
3977 -    :try_start_39c
3978 +    :goto_3a1
3979 +    :try_start_3a1
3980      const-string v3, "SystemServer"
3981
3982      const-string v9, "Network Service Discovery Service"
3983 @@ -1124,11 +1163,11 @@
3984      move-object/from16 v0, v98
3985
3986      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3987 -    :try_end_3ae
3988 -    .catch Ljava/lang/Throwable; {:try_start_39c .. :try_end_3ae} :catch_7e7
3989 +    :try_end_3b3
3990 +    .catch Ljava/lang/Throwable; {:try_start_3a1 .. :try_end_3b3} :catch_7ec
3991
3992 -    :goto_3ae
3993 -    :try_start_3ae
3994 +    :goto_3b3
3995 +    :try_start_3b3
3996      const-string v3, "SystemServer"
3997
3998      const-string v9, "Throttle Service"
3999 @@ -1140,22 +1179,22 @@
4000      move-object/from16 v0, v103
4001
4002      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4003 -    :try_end_3bc
4004 -    .catch Ljava/lang/Throwable; {:try_start_3ae .. :try_end_3bc} :catch_7f3
4005 +    :try_end_3c1
4006 +    .catch Ljava/lang/Throwable; {:try_start_3b3 .. :try_end_3c1} :catch_7f8
4007
4008 -    :try_start_3bc
4009 +    :try_start_3c1
4010      const-string v3, "throttle"
4011
4012      move-object/from16 v0, v103
4013
4014      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4015 -    :try_end_3c3
4016 -    .catch Ljava/lang/Throwable; {:try_start_3bc .. :try_end_3c3} :catch_9aa
4017 +    :try_end_3c8
4018 +    .catch Ljava/lang/Throwable; {:try_start_3c1 .. :try_end_3c8} :catch_9af
4019
4020      move-object/from16 v102, v103
4021
4022 -    :goto_3c5
4023 -    :try_start_3c5
4024 +    :goto_3ca
4025 +    :try_start_3ca
4026      const-string v3, "SystemServer"
4027
4028      const-string v9, "UpdateLock Service"
4029 @@ -1169,34 +1208,34 @@
4030      invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
4031
4032      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4033 -    :try_end_3d6
4034 -    .catch Ljava/lang/Throwable; {:try_start_3c5 .. :try_end_3d6} :catch_7ff
4035 +    :try_end_3db
4036 +    .catch Ljava/lang/Throwable; {:try_start_3ca .. :try_end_3db} :catch_804
4037
4038 -    :goto_3d6
4039 -    if-eqz v81, :cond_3db
4040 +    :goto_3db
4041 +    if-eqz v81, :cond_3e0
4042
4043      invoke-virtual/range {v81 .. v81}, Lcom/android/server/MountService;->waitForAsecScan()V
4044
4045 -    :cond_3db
4046 -    if-eqz v41, :cond_3e0
4047 -
4048 -    :try_start_3dd
4049 -    invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4050 -    :try_end_3e0
4051 -    .catch Ljava/lang/Throwable; {:try_start_3dd .. :try_end_3e0} :catch_80b
4052 -
4053      :cond_3e0
4054 -    :goto_3e0
4055 -    if-eqz v57, :cond_3e5
4056 +    if-eqz v41, :cond_3e5
4057
4058      :try_start_3e2
4059 -    invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4060 +    invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4061      :try_end_3e5
4062 -    .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_817
4063 +    .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_810
4064
4065      :cond_3e5
4066      :goto_3e5
4067 -    :try_start_3e5
4068 +    if-eqz v57, :cond_3ea
4069 +
4070 +    :try_start_3e7
4071 +    invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4072 +    :try_end_3ea
4073 +    .catch Ljava/lang/Throwable; {:try_start_3e7 .. :try_end_3ea} :catch_81c
4074 +
4075 +    :cond_3ea
4076 +    :goto_3ea
4077 +    :try_start_3ea
4078      const-string v3, "SystemServer"
4079
4080      const-string v9, "Notification Manager"
4081 @@ -1212,10 +1251,10 @@
4082      move-object/from16 v2, v74
4083
4084      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4085 -    :try_end_3f7
4086 -    .catch Ljava/lang/Throwable; {:try_start_3e5 .. :try_end_3f7} :catch_823
4087 +    :try_end_3fc
4088 +    .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3fc} :catch_828
4089
4090 -    :try_start_3f7
4091 +    :try_start_3fc
4092      const-string v3, "notification"
4093
4094      move-object/from16 v0, v88
4095 @@ -1225,13 +1264,13 @@
4096      move-object/from16 v0, v88
4097
4098      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4099 -    :try_end_403
4100 -    .catch Ljava/lang/Throwable; {:try_start_3f7 .. :try_end_403} :catch_9a5
4101 +    :try_end_408
4102 +    .catch Ljava/lang/Throwable; {:try_start_3fc .. :try_end_408} :catch_9aa
4103
4104      move-object/from16 v87, v88
4105
4106 -    :goto_405
4107 -    :try_start_405
4108 +    :goto_40a
4109 +    :try_start_40a
4110      const-string v3, "SystemServer"
4111
4112      const-string v9, "Device Storage Monitor"
4113 @@ -1245,11 +1284,11 @@
4114      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4115
4116      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4117 -    :try_end_416
4118 -    .catch Ljava/lang/Throwable; {:try_start_405 .. :try_end_416} :catch_82f
4119 +    :try_end_41b
4120 +    .catch Ljava/lang/Throwable; {:try_start_40a .. :try_end_41b} :catch_834
4121
4122 -    :goto_416
4123 -    :try_start_416
4124 +    :goto_41b
4125 +    :try_start_41b
4126      const-string v3, "SystemServer"
4127
4128      const-string v9, "Location Manager"
4129 @@ -1261,22 +1300,22 @@
4130      move-object/from16 v0, v77
4131
4132      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4133 -    :try_end_424
4134 -    .catch Ljava/lang/Throwable; {:try_start_416 .. :try_end_424} :catch_83b
4135 +    :try_end_429
4136 +    .catch Ljava/lang/Throwable; {:try_start_41b .. :try_end_429} :catch_840
4137
4138 -    :try_start_424
4139 +    :try_start_429
4140      const-string v3, "location"
4141
4142      move-object/from16 v0, v77
4143
4144      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4145 -    :try_end_42b
4146 -    .catch Ljava/lang/Throwable; {:try_start_424 .. :try_end_42b} :catch_9a0
4147 +    :try_end_430
4148 +    .catch Ljava/lang/Throwable; {:try_start_429 .. :try_end_430} :catch_9a5
4149
4150      move-object/from16 v76, v77
4151
4152 -    :goto_42d
4153 -    :try_start_42d
4154 +    :goto_432
4155 +    :try_start_432
4156      const-string v3, "SystemServer"
4157
4158      const-string v9, "Country Detector"
4159 @@ -1288,22 +1327,22 @@
4160      move-object/from16 v0, v59
4161
4162      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4163 -    :try_end_43b
4164 -    .catch Ljava/lang/Throwable; {:try_start_42d .. :try_end_43b} :catch_847
4165 +    :try_end_440
4166 +    .catch Ljava/lang/Throwable; {:try_start_432 .. :try_end_440} :catch_84c
4167
4168 -    :try_start_43b
4169 +    :try_start_440
4170      const-string v3, "country_detector"
4171
4172      move-object/from16 v0, v59
4173
4174      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4175 -    :try_end_442
4176 -    .catch Ljava/lang/Throwable; {:try_start_43b .. :try_end_442} :catch_99b
4177 +    :try_end_447
4178 +    .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_447} :catch_9a0
4179
4180      move-object/from16 v58, v59
4181
4182 -    :goto_444
4183 -    :try_start_444
4184 +    :goto_449
4185 +    :try_start_449
4186      const-string v3, "SystemServer"
4187
4188      const-string v9, "Search Service"
4189 @@ -1317,11 +1356,11 @@
4190      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4191
4192      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4193 -    :try_end_455
4194 -    .catch Ljava/lang/Throwable; {:try_start_444 .. :try_end_455} :catch_853
4195 +    :try_end_45a
4196 +    .catch Ljava/lang/Throwable; {:try_start_449 .. :try_end_45a} :catch_858
4197
4198 -    :goto_455
4199 -    :try_start_455
4200 +    :goto_45a
4201 +    :try_start_45a
4202      const-string v3, "SystemServer"
4203
4204      const-string v9, "DropBox Service"
4205 @@ -1341,10 +1380,10 @@
4206      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4207
4208      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4209 -    :try_end_46d
4210 -    .catch Ljava/lang/Throwable; {:try_start_455 .. :try_end_46d} :catch_85f
4211 +    :try_end_472
4212 +    .catch Ljava/lang/Throwable; {:try_start_45a .. :try_end_472} :catch_864
4213
4214 -    :goto_46d
4215 +    :goto_472
4216      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4217
4218      move-result-object v3
4219 @@ -1355,38 +1394,38 @@
4220
4221      move-result v3
4222
4223 -    if-eqz v3, :cond_493
4224 +    if-eqz v3, :cond_498
4225
4226 -    :try_start_47a
4227 +    :try_start_47f
4228      const-string v3, "SystemServer"
4229
4230      const-string v9, "Wallpaper Service"
4231
4232      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4233
4234 -    if-nez v16, :cond_493
4235 +    if-nez v16, :cond_498
4236
4237      new-instance v114, Lcom/android/server/WallpaperManagerService;
4238
4239      move-object/from16 v0, v114
4240
4241      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4242 -    :try_end_48a
4243 -    .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_48a} :catch_86b
4244 +    :try_end_48f
4245 +    .catch Ljava/lang/Throwable; {:try_start_47f .. :try_end_48f} :catch_870
4246
4247 -    :try_start_48a
4248 +    :try_start_48f
4249      const-string v3, "wallpaper"
4250
4251      move-object/from16 v0, v114
4252
4253      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4254 -    :try_end_491
4255 -    .catch Ljava/lang/Throwable; {:try_start_48a .. :try_end_491} :catch_996
4256 +    :try_end_496
4257 +    .catch Ljava/lang/Throwable; {:try_start_48f .. :try_end_496} :catch_99b
4258
4259      move-object/from16 v113, v114
4260
4261 -    :cond_493
4262 -    :goto_493
4263 +    :cond_498
4264 +    :goto_498
4265      const-string v3, "0"
4266
4267      const-string v9, "system_init.startaudioservice"
4268 @@ -1399,9 +1438,9 @@
4269
4270      move-result v3
4271
4272 -    if-nez v3, :cond_4b2
4273 +    if-nez v3, :cond_4b7
4274
4275 -    :try_start_4a1
4276 +    :try_start_4a6
4277      const-string v3, "SystemServer"
4278
4279      const-string v9, "Audio Service"
4280 @@ -1415,12 +1454,12 @@
4281      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4282
4283      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4284 -    :try_end_4b2
4285 -    .catch Ljava/lang/Throwable; {:try_start_4a1 .. :try_end_4b2} :catch_877
4286 +    :try_end_4b7
4287 +    .catch Ljava/lang/Throwable; {:try_start_4a6 .. :try_end_4b7} :catch_87c
4288
4289 -    :cond_4b2
4290 -    :goto_4b2
4291 -    :try_start_4b2
4292 +    :cond_4b7
4293 +    :goto_4b7
4294 +    :try_start_4b7
4295      const-string v3, "SystemServer"
4296
4297      const-string v9, "Dock Observer"
4298 @@ -1432,13 +1471,13 @@
4299      move-object/from16 v0, v64
4300
4301      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4302 -    :try_end_4c0
4303 -    .catch Ljava/lang/Throwable; {:try_start_4b2 .. :try_end_4c0} :catch_883
4304 +    :try_end_4c5
4305 +    .catch Ljava/lang/Throwable; {:try_start_4b7 .. :try_end_4c5} :catch_888
4306
4307      move-object/from16 v63, v64
4308
4309 -    :goto_4c2
4310 -    :try_start_4c2
4311 +    :goto_4c7
4312 +    :try_start_4c7
4313      const-string v3, "SystemServer"
4314
4315      const-string v9, "Wired Accessory Observer"
4316 @@ -1448,11 +1487,11 @@
4317      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4318
4319      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4320 -    :try_end_4ce
4321 -    .catch Ljava/lang/Throwable; {:try_start_4c2 .. :try_end_4ce} :catch_88f
4322 +    :try_end_4d3
4323 +    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d3} :catch_894
4324
4325 -    :goto_4ce
4326 -    :try_start_4ce
4327 +    :goto_4d3
4328 +    :try_start_4d3
4329      const-string v3, "SystemServer"
4330
4331      const-string v9, "USB Service"
4332 @@ -1464,22 +1503,22 @@
4333      move-object/from16 v0, v109
4334
4335      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4336 -    :try_end_4dc
4337 -    .catch Ljava/lang/Throwable; {:try_start_4ce .. :try_end_4dc} :catch_89b
4338 +    :try_end_4e1
4339 +    .catch Ljava/lang/Throwable; {:try_start_4d3 .. :try_end_4e1} :catch_8a0
4340
4341 -    :try_start_4dc
4342 +    :try_start_4e1
4343      const-string v3, "usb"
4344
4345      move-object/from16 v0, v109
4346
4347      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4348 -    :try_end_4e3
4349 -    .catch Ljava/lang/Throwable; {:try_start_4dc .. :try_end_4e3} :catch_991
4350 +    :try_end_4e8
4351 +    .catch Ljava/lang/Throwable; {:try_start_4e1 .. :try_end_4e8} :catch_996
4352
4353      move-object/from16 v108, v109
4354
4355 -    :goto_4e5
4356 -    :try_start_4e5
4357 +    :goto_4ea
4358 +    :try_start_4ea
4359      const-string v3, "SystemServer"
4360
4361      const-string v9, "Serial Service"
4362 @@ -1491,22 +1530,22 @@
4363      move-object/from16 v0, v97
4364
4365      invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4366 -    :try_end_4f3
4367 -    .catch Ljava/lang/Throwable; {:try_start_4e5 .. :try_end_4f3} :catch_8a7
4368 +    :try_end_4f8
4369 +    .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_8ac
4370
4371 -    :try_start_4f3
4372 +    :try_start_4f8
4373      const-string v3, "serial"
4374
4375      move-object/from16 v0, v97
4376
4377      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4378 -    :try_end_4fa
4379 -    .catch Ljava/lang/Throwable; {:try_start_4f3 .. :try_end_4fa} :catch_98c
4380 +    :try_end_4ff
4381 +    .catch Ljava/lang/Throwable; {:try_start_4f8 .. :try_end_4ff} :catch_991
4382
4383      move-object/from16 v96, v97
4384
4385 -    :goto_4fc
4386 -    :try_start_4fc
4387 +    :goto_501
4388 +    :try_start_501
4389      const-string v3, "SystemServer"
4390
4391      const-string v9, "UI Mode Manager Service"
4392 @@ -1518,13 +1557,13 @@
4393      move-object/from16 v0, v107
4394
4395      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4396 -    :try_end_50a
4397 -    .catch Ljava/lang/Throwable; {:try_start_4fc .. :try_end_50a} :catch_8b3
4398 +    :try_end_50f
4399 +    .catch Ljava/lang/Throwable; {:try_start_501 .. :try_end_50f} :catch_8b8
4400
4401      move-object/from16 v106, v107
4402
4403 -    :goto_50c
4404 -    :try_start_50c
4405 +    :goto_511
4406 +    :try_start_511
4407      const-string v3, "SystemServer"
4408
4409      const-string v9, "Backup Service"
4410 @@ -1538,11 +1577,11 @@
4411      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4412
4413      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4414 -    :try_end_51d
4415 -    .catch Ljava/lang/Throwable; {:try_start_50c .. :try_end_51d} :catch_8bf
4416 +    :try_end_522
4417 +    .catch Ljava/lang/Throwable; {:try_start_511 .. :try_end_522} :catch_8c4
4418
4419 -    :goto_51d
4420 -    :try_start_51d
4421 +    :goto_522
4422 +    :try_start_522
4423      const-string v3, "SystemServer"
4424
4425      const-string v9, "AppWidget Service"
4426 @@ -1554,22 +1593,22 @@
4427      move-object/from16 v0, v45
4428
4429      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4430 -    :try_end_52b
4431 -    .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_8cb
4432 +    :try_end_530
4433 +    .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_8d0
4434
4435 -    :try_start_52b
4436 +    :try_start_530
4437      const-string v3, "appwidget"
4438
4439      move-object/from16 v0, v45
4440
4441      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4442 -    :try_end_532
4443 -    .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_987
4444 +    :try_end_537
4445 +    .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_98c
4446
4447      move-object/from16 v44, v45
4448
4449 -    :goto_534
4450 -    :try_start_534
4451 +    :goto_539
4452 +    :try_start_539
4453      const-string v3, "SystemServer"
4454
4455      const-string v9, "Recognition Service"
4456 @@ -1581,13 +1620,13 @@
4457      move-object/from16 v0, v95
4458
4459      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4460 -    :try_end_542
4461 -    .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_8d7
4462 +    :try_end_547
4463 +    .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_8dc
4464
4465      move-object/from16 v94, v95
4466
4467 -    :goto_544
4468 -    :try_start_544
4469 +    :goto_549
4470 +    :try_start_549
4471      const-string v3, "SystemServer"
4472
4473      const-string v9, "DiskStats Service"
4474 @@ -1601,11 +1640,11 @@
4475      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4476
4477      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4478 -    :try_end_555
4479 -    .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_8e3
4480 +    :try_end_55a
4481 +    .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_8e8
4482
4483 -    :goto_555
4484 -    :try_start_555
4485 +    :goto_55a
4486 +    :try_start_55a
4487      const-string v3, "SystemServer"
4488
4489      const-string v9, "SamplingProfiler Service"
4490 @@ -1619,11 +1658,11 @@
4491      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4492
4493      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4494 -    :try_end_566
4495 -    .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_566} :catch_8ef
4496 +    :try_end_56b
4497 +    .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_56b} :catch_8f4
4498
4499 -    :goto_566
4500 -    :try_start_566
4501 +    :goto_56b
4502 +    :try_start_56b
4503      const-string v3, "SystemServer"
4504
4505      const-string v9, "NetworkTimeUpdateService"
4506 @@ -1635,13 +1674,13 @@
4507      move-object/from16 v0, v86
4508
4509      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4510 -    :try_end_574
4511 -    .catch Ljava/lang/Throwable; {:try_start_566 .. :try_end_574} :catch_8fb
4512 +    :try_end_579
4513 +    .catch Ljava/lang/Throwable; {:try_start_56b .. :try_end_579} :catch_900
4514
4515      move-object/from16 v85, v86
4516
4517 -    :goto_576
4518 -    :try_start_576
4519 +    :goto_57b
4520 +    :try_start_57b
4521      const-string v3, "SystemServer"
4522
4523      const-string v9, "CommonTimeManagementService"
4524 @@ -1653,22 +1692,22 @@
4525      move-object/from16 v0, v53
4526
4527      invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4528 -    :try_end_584
4529 -    .catch Ljava/lang/Throwable; {:try_start_576 .. :try_end_584} :catch_907
4530 +    :try_end_589
4531 +    .catch Ljava/lang/Throwable; {:try_start_57b .. :try_end_589} :catch_90c
4532
4533 -    :try_start_584
4534 +    :try_start_589
4535      const-string v3, "commontime_management"
4536
4537      move-object/from16 v0, v53
4538
4539      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4540 -    :try_end_58b
4541 -    .catch Ljava/lang/Throwable; {:try_start_584 .. :try_end_58b} :catch_983
4542 +    :try_end_590
4543 +    .catch Ljava/lang/Throwable; {:try_start_589 .. :try_end_590} :catch_988
4544
4545      move-object/from16 v52, v53
4546
4547 -    :goto_58d
4548 -    :try_start_58d
4549 +    :goto_592
4550 +    :try_start_592
4551      const-string v3, "SystemServer"
4552
4553      const-string v9, "CertBlacklister"
4554 @@ -1678,10 +1717,10 @@
4555      new-instance v3, Lcom/android/server/CertBlacklister;
4556
4557      invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4558 -    :try_end_599
4559 -    .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_599} :catch_913
4560 +    :try_end_59e
4561 +    .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_59e} :catch_918
4562
4563 -    :goto_599
4564 +    :goto_59e
4565      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4566
4567      move-result-object v3
4568 @@ -1692,9 +1731,9 @@
4569
4570      move-result v3
4571
4572 -    if-eqz v3, :cond_5bd
4573 +    if-eqz v3, :cond_5c2
4574
4575 -    :try_start_5a6
4576 +    :try_start_5ab
4577      const-string v3, "SystemServer"
4578
4579      const-string v9, "Dreams Service"
4580 @@ -1706,27 +1745,27 @@
4581      move-object/from16 v0, v66
4582
4583      invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4584 -    :try_end_5b4
4585 -    .catch Ljava/lang/Throwable; {:try_start_5a6 .. :try_end_5b4} :catch_91f
4586 +    :try_end_5b9
4587 +    .catch Ljava/lang/Throwable; {:try_start_5ab .. :try_end_5b9} :catch_924
4588
4589 -    :try_start_5b4
4590 +    :try_start_5b9
4591      const-string v3, "dreams"
4592
4593      move-object/from16 v0, v66
4594
4595      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4596 -    :try_end_5bb
4597 -    .catch Ljava/lang/Throwable; {:try_start_5b4 .. :try_end_5bb} :catch_97f
4598 +    :try_end_5c0
4599 +    .catch Ljava/lang/Throwable; {:try_start_5b9 .. :try_end_5c0} :catch_984
4600
4601      move-object/from16 v65, v66
4602
4603 -    :cond_5bd
4604 -    :goto_5bd
4605 +    :cond_5c2
4606 +    :goto_5c2
4607      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
4608
4609      move-result v28
4610
4611 -    if-eqz v28, :cond_92b
4612 +    if-eqz v28, :cond_930
4613
4614      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4615
4616 @@ -1744,38 +1783,38 @@
4617
4618      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4619
4620 -    :goto_5d4
4621 -    :try_start_5d4
4622 -    invoke-virtual/range {v110 .. v110}, Lcom/android/server/VibratorService;->systemReady()V
4623 -    :try_end_5d7
4624 -    .catch Ljava/lang/Throwable; {:try_start_5d4 .. :try_end_5d7} :catch_934
4625 -
4626 -    :goto_5d7
4627 -    if-eqz v61, :cond_5dc
4628 -
4629 +    :goto_5d9
4630      :try_start_5d9
4631 -    invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4632 +    invoke-virtual/range {v110 .. v110}, Lcom/android/server/VibratorService;->systemReady()V
4633      :try_end_5dc
4634 -    .catch Ljava/lang/Throwable; {:try_start_5d9 .. :try_end_5dc} :catch_940
4635 +    .catch Ljava/lang/Throwable; {:try_start_5d9 .. :try_end_5dc} :catch_939
4636
4637 -    :cond_5dc
4638      :goto_5dc
4639 -    if-eqz v87, :cond_5e1
4640 +    if-eqz v61, :cond_5e1
4641
4642      :try_start_5de
4643 -    invoke-virtual/range {v87 .. v87}, Lcom/android/server/NotificationManagerService;->systemReady()V
4644 +    invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4645      :try_end_5e1
4646 -    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5e1} :catch_94c
4647 +    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5e1} :catch_945
4648
4649      :cond_5e1
4650      :goto_5e1
4651 -    :try_start_5e1
4652 +    if-eqz v87, :cond_5e6
4653 +
4654 +    :try_start_5e3
4655 +    invoke-virtual/range {v87 .. v87}, Lcom/android/server/NotificationManagerService;->systemReady()V
4656 +    :try_end_5e6
4657 +    .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5e6} :catch_951
4658 +
4659 +    :cond_5e6
4660 +    :goto_5e6
4661 +    :try_start_5e6
4662      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4663 -    :try_end_5e4
4664 -    .catch Ljava/lang/Throwable; {:try_start_5e1 .. :try_end_5e4} :catch_958
4665 +    :try_end_5e9
4666 +    .catch Ljava/lang/Throwable; {:try_start_5e6 .. :try_end_5e9} :catch_95d
4667
4668 -    :goto_5e4
4669 -    if-eqz v28, :cond_5ed
4670 +    :goto_5e9
4671 +    if-eqz v28, :cond_5f2
4672
4673      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4674
4675 @@ -1783,7 +1822,7 @@
4676
4677      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4678
4679 -    :cond_5ed
4680 +    :cond_5f2
4681      invoke-virtual/range {v119 .. v119}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4682
4683      move-result-object v54
4684 @@ -1820,18 +1859,18 @@
4685
4686      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4687
4688 -    :try_start_615
4689 +    :try_start_61a
4690      invoke-interface/range {v90 .. v90}, Landroid/content/pm/IPackageManager;->systemReady()V
4691 -    :try_end_618
4692 -    .catch Ljava/lang/Throwable; {:try_start_615 .. :try_end_618} :catch_964
4693 +    :try_end_61d
4694 +    .catch Ljava/lang/Throwable; {:try_start_61a .. :try_end_61d} :catch_969
4695
4696 -    :goto_618
4697 -    :try_start_618
4698 +    :goto_61d
4699 +    :try_start_61d
4700      invoke-virtual/range {v78 .. v78}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4701 -    :try_end_61b
4702 -    .catch Ljava/lang/Throwable; {:try_start_618 .. :try_end_61b} :catch_970
4703 +    :try_end_620
4704 +    .catch Ljava/lang/Throwable; {:try_start_61d .. :try_end_620} :catch_975
4705
4706 -    :goto_61b
4707 +    :goto_620
4708      move-object/from16 v17, v4
4709
4710      move-object/from16 v18, v5
4711 @@ -1894,7 +1933,7 @@
4712
4713      move-result v3
4714
4715 -    if-eqz v3, :cond_664
4716 +    if-eqz v3, :cond_669
4717
4718      const-string v3, "SystemServer"
4719
4720 @@ -1902,7 +1941,7 @@
4721
4722      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4723
4724 -    :cond_664
4725 +    :cond_669
4726      invoke-static {}, Landroid/os/Looper;->loop()V
4727
4728      const-string v3, "SystemServer"
4729 @@ -1913,25 +1952,25 @@
4730
4731      return-void
4732
4733 -    :cond_66f
4734 +    :cond_674
4735      const/16 v93, 0x0
4736
4737      goto/16 :goto_35
4738
4739 -    :cond_673
4740 +    :cond_678
4741      const/16 v92, 0x0
4742
4743      goto/16 :goto_47
4744
4745 -    :cond_677
4746 +    :cond_67c
4747      invoke-static/range {v69 .. v69}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4748
4749      move-result v68
4750
4751      goto/16 :goto_60
4752
4753 -    :cond_67d
4754 -    :try_start_67d
4755 +    :cond_682
4756 +    :try_start_682
4757      const-string v3, "1"
4758
4759      move-object/from16 v0, v60
4760 @@ -1952,15 +1991,15 @@
4761
4762      goto/16 :goto_117
4763
4764 -    :cond_692
4765 +    :cond_697
4766      const/4 v3, 0x0
4767
4768      goto/16 :goto_11a
4769
4770 -    :catch_695
4771 +    :catch_69a
4772      move-exception v67
4773
4774 -    :goto_696
4775 +    :goto_69b
4776      const-string v3, "SystemServer"
4777
4778      const-string v9, "Failure starting Account Manager"
4779 @@ -1968,19 +2007,19 @@
4780      move-object/from16 v0, v67
4781
4782      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4783 -    :try_end_69f
4784 -    .catch Ljava/lang/RuntimeException; {:try_start_67d .. :try_end_69f} :catch_6a1
4785 +    :try_end_6a4
4786 +    .catch Ljava/lang/RuntimeException; {:try_start_682 .. :try_end_6a4} :catch_6a6
4787
4788      goto/16 :goto_148
4789
4790 -    :catch_6a1
4791 +    :catch_6a6
4792      move-exception v67
4793
4794      move-object/from16 v7, v43
4795
4796      move-object/from16 v5, v46
4797
4798 -    :goto_6a6
4799 +    :goto_6ab
4800      const-string v3, "System"
4801
4802      const-string v9, "******************************************"
4803 @@ -1995,51 +2034,51 @@
4804
4805      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4806
4807 -    goto/16 :goto_210
4808 +    goto/16 :goto_215
4809
4810 -    :cond_6b8
4811 +    :cond_6bd
4812      const/4 v3, 0x0
4813
4814      goto/16 :goto_155
4815
4816 -    :cond_6bb
4817 +    :cond_6c0
4818      const/4 v3, 0x0
4819
4820      move v9, v3
4821
4822 -    goto/16 :goto_1d3
4823 +    goto/16 :goto_1d8
4824
4825 -    :cond_6bf
4826 +    :cond_6c4
4827      const/4 v3, 0x0
4828
4829 -    goto/16 :goto_1d6
4830 +    goto/16 :goto_1db
4831
4832 -    :cond_6c2
4833 +    :cond_6c7
4834      const/4 v3, 0x1
4835
4836      move/from16 v0, v68
4837
4838 -    if-ne v0, v3, :cond_6d6
4839 +    if-ne v0, v3, :cond_6db
4840
4841 -    :try_start_6c7
4842 +    :try_start_6cc
4843      const-string v3, "SystemServer"
4844
4845      const-string v9, "No Bluetooth Service (factory test)"
4846
4847      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4848
4849 -    goto/16 :goto_20c
4850 +    goto/16 :goto_211
4851
4852 -    :catch_6d0
4853 +    :catch_6d5
4854      move-exception v67
4855
4856      move-object/from16 v110, v111
4857
4858      move-object/from16 v74, v75
4859
4860 -    goto :goto_6a6
4861 +    goto :goto_6ab
4862
4863 -    :cond_6d6
4864 +    :cond_6db
4865      const-string v3, "SystemServer"
4866
4867      const-string v9, "Bluetooth Service"
4868 @@ -2051,10 +2090,10 @@
4869      move-object/from16 v0, v48
4870
4871      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4872 -    :try_end_6e4
4873 -    .catch Ljava/lang/RuntimeException; {:try_start_6c7 .. :try_end_6e4} :catch_6d0
4874 +    :try_end_6e9
4875 +    .catch Ljava/lang/RuntimeException; {:try_start_6cc .. :try_end_6e9} :catch_6d5
4876
4877 -    :try_start_6e4
4878 +    :try_start_6e9
4879      const-string v3, "bluetooth"
4880
4881      move-object/from16 v0, v48
4882 @@ -2075,7 +2114,7 @@
4883
4884      move-result v3
4885
4886 -    if-nez v3, :cond_711
4887 +    if-nez v3, :cond_716
4888
4889      new-instance v50, Landroid/server/BluetoothA2dpService;
4890
4891 @@ -2084,10 +2123,10 @@
4892      move-object/from16 v1, v48
4893
4894      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4895 -    :try_end_705
4896 -    .catch Ljava/lang/RuntimeException; {:try_start_6e4 .. :try_end_705} :catch_a12
4897 +    :try_end_70a
4898 +    .catch Ljava/lang/RuntimeException; {:try_start_6e9 .. :try_end_70a} :catch_a17
4899
4900 -    :try_start_705
4901 +    :try_start_70a
4902      const-string v3, "bluetooth_a2dp"
4903
4904      move-object/from16 v0, v50
4905 @@ -2095,13 +2134,13 @@
4906      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4907
4908      invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
4909 -    :try_end_70f
4910 -    .catch Ljava/lang/RuntimeException; {:try_start_705 .. :try_end_70f} :catch_a1b
4911 +    :try_end_714
4912 +    .catch Ljava/lang/RuntimeException; {:try_start_70a .. :try_end_714} :catch_a20
4913
4914      move-object/from16 v49, v50
4915
4916 -    :cond_711
4917 -    :try_start_711
4918 +    :cond_716
4919 +    :try_start_716
4920      move-object/from16 v0, p0
4921
4922      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4923 @@ -2114,21 +2153,21 @@
4924
4925      move-result v51
4926
4927 -    if-eqz v51, :cond_721
4928 +    if-eqz v51, :cond_726
4929
4930      invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->enable()Z
4931 -    :try_end_721
4932 -    .catch Ljava/lang/RuntimeException; {:try_start_711 .. :try_end_721} :catch_a12
4933 +    :try_end_726
4934 +    .catch Ljava/lang/RuntimeException; {:try_start_716 .. :try_end_726} :catch_a17
4935
4936 -    :cond_721
4937 +    :cond_726
4938      move-object/from16 v47, v48
4939
4940 -    goto/16 :goto_20c
4941 +    goto/16 :goto_211
4942
4943 -    :catch_725
4944 +    :catch_72a
4945      move-exception v67
4946
4947 -    :goto_726
4948 +    :goto_72b
4949      const-string v3, "starting Input Manager Service"
4950
4951      move-object/from16 v0, p0
4952 @@ -2137,9 +2176,9 @@
4953
4954      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4955
4956 -    goto/16 :goto_244
4957 +    goto/16 :goto_249
4958
4959 -    :catch_731
4960 +    :catch_736
4961      move-exception v67
4962
4963      const-string v3, "starting Accessibility Manager"
4964 @@ -2150,9 +2189,9 @@
4965
4966      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4967
4968 -    goto/16 :goto_255
4969 +    goto/16 :goto_25a
4970
4971 -    :catch_73d
4972 +    :catch_742
4973      move-exception v67
4974
4975      const-string v3, "making display ready"
4976 @@ -2163,9 +2202,9 @@
4977
4978      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4979
4980 -    goto/16 :goto_258
4981 +    goto/16 :goto_25d
4982
4983 -    :catch_749
4984 +    :catch_74e
4985      move-exception v67
4986
4987      const-string v3, "performing boot dexopt"
4988 @@ -2176,12 +2215,12 @@
4989
4990      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4991
4992 -    goto/16 :goto_25b
4993 +    goto/16 :goto_260
4994
4995 -    :catch_755
4996 +    :catch_75a
4997      move-exception v67
4998
4999 -    :goto_756
5000 +    :goto_75b
5001      const-string v3, "starting Mount Service"
5002
5003      move-object/from16 v0, p0
5004 @@ -2190,12 +2229,12 @@
5005
5006      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5007
5008 -    goto/16 :goto_29a
5009 +    goto/16 :goto_29f
5010
5011 -    :catch_761
5012 +    :catch_766
5013      move-exception v67
5014
5015 -    :goto_762
5016 +    :goto_767
5017      const-string v3, "starting LockSettingsService service"
5018
5019      move-object/from16 v0, p0
5020 @@ -2204,12 +2243,12 @@
5021
5022      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5023
5024 -    goto/16 :goto_2b1
5025 +    goto/16 :goto_2b6
5026
5027 -    :catch_76d
5028 +    :catch_772
5029      move-exception v67
5030
5031 -    :goto_76e
5032 +    :goto_773
5033      const-string v3, "starting DevicePolicyService"
5034
5035      move-object/from16 v0, p0
5036 @@ -2218,12 +2257,12 @@
5037
5038      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5039
5040 -    goto/16 :goto_2c8
5041 +    goto/16 :goto_2cd
5042
5043 -    :catch_779
5044 +    :catch_77e
5045      move-exception v67
5046
5047 -    :goto_77a
5048 +    :goto_77f
5049      const-string v3, "starting StatusBarManagerService"
5050
5051      move-object/from16 v0, p0
5052 @@ -2232,9 +2271,9 @@
5053
5054      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5055
5056 -    goto/16 :goto_2e1
5057 +    goto/16 :goto_2e6
5058
5059 -    :catch_785
5060 +    :catch_78a
5061      move-exception v67
5062
5063      const-string v3, "starting Clipboard Service"
5064 @@ -2245,9 +2284,9 @@
5065
5066      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5067
5068 -    goto/16 :goto_2f2
5069 +    goto/16 :goto_2f7
5070
5071 -    :catch_791
5072 +    :catch_796
5073      move-exception v67
5074
5075      const-string v3, "starting NetworkManagement Service"
5076 @@ -2258,12 +2297,12 @@
5077
5078      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5079
5080 -    goto/16 :goto_302
5081 +    goto/16 :goto_307
5082
5083 -    :catch_79d
5084 +    :catch_7a2
5085      move-exception v67
5086
5087 -    :goto_79e
5088 +    :goto_7a3
5089      const-string v3, "starting Text Service Manager Service"
5090
5091      move-object/from16 v0, p0
5092 @@ -2272,12 +2311,12 @@
5093
5094      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5095
5096 -    goto/16 :goto_319
5097 +    goto/16 :goto_31e
5098
5099 -    :catch_7a9
5100 +    :catch_7ae
5101      move-exception v67
5102
5103 -    :goto_7aa
5104 +    :goto_7af
5105      const-string v3, "starting NetworkStats Service"
5106
5107      move-object/from16 v0, p0
5108 @@ -2286,14 +2325,14 @@
5109
5110      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5111
5112 -    goto/16 :goto_330
5113 +    goto/16 :goto_335
5114
5115 -    :catch_7b5
5116 +    :catch_7ba
5117      move-exception v67
5118
5119      move-object/from16 v8, v83
5120
5121 -    :goto_7b8
5122 +    :goto_7bd
5123      const-string v3, "starting NetworkPolicy Service"
5124
5125      move-object/from16 v0, p0
5126 @@ -2302,12 +2341,12 @@
5127
5128      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5129
5130 -    goto/16 :goto_347
5131 +    goto/16 :goto_34c
5132
5133 -    :catch_7c3
5134 +    :catch_7c8
5135      move-exception v67
5136
5137 -    :goto_7c4
5138 +    :goto_7c9
5139      const-string v3, "starting Wi-Fi P2pService"
5140
5141      move-object/from16 v0, p0
5142 @@ -2316,12 +2355,12 @@
5143
5144      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5145
5146 -    goto/16 :goto_35e
5147 +    goto/16 :goto_363
5148
5149 -    :catch_7cf
5150 +    :catch_7d4
5151      move-exception v67
5152
5153 -    :goto_7d0
5154 +    :goto_7d5
5155      const-string v3, "starting Wi-Fi Service"
5156
5157      move-object/from16 v0, p0
5158 @@ -2330,12 +2369,12 @@
5159
5160      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5161
5162 -    goto/16 :goto_375
5163 +    goto/16 :goto_37a
5164
5165 -    :catch_7db
5166 +    :catch_7e0
5167      move-exception v67
5168
5169 -    :goto_7dc
5170 +    :goto_7e1
5171      const-string v3, "starting Connectivity Service"
5172
5173      move-object/from16 v0, p0
5174 @@ -2344,9 +2383,9 @@
5175
5176      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5177
5178 -    goto/16 :goto_39c
5179 +    goto/16 :goto_3a1
5180
5181 -    :catch_7e7
5182 +    :catch_7ec
5183      move-exception v67
5184
5185      const-string v3, "starting Service Discovery Service"
5186 @@ -2357,12 +2396,12 @@
5187
5188      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5189
5190 -    goto/16 :goto_3ae
5191 +    goto/16 :goto_3b3
5192
5193 -    :catch_7f3
5194 +    :catch_7f8
5195      move-exception v67
5196
5197 -    :goto_7f4
5198 +    :goto_7f9
5199      const-string v3, "starting ThrottleService"
5200
5201      move-object/from16 v0, p0
5202 @@ -2371,9 +2410,9 @@
5203
5204      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5205
5206 -    goto/16 :goto_3c5
5207 +    goto/16 :goto_3ca
5208
5209 -    :catch_7ff
5210 +    :catch_804
5211      move-exception v67
5212
5213      const-string v3, "starting UpdateLockService"
5214 @@ -2384,9 +2423,9 @@
5215
5216      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5217
5218 -    goto/16 :goto_3d6
5219 +    goto/16 :goto_3db
5220
5221 -    :catch_80b
5222 +    :catch_810
5223      move-exception v67
5224
5225      const-string v3, "making Account Manager Service ready"
5226 @@ -2397,9 +2436,9 @@
5227
5228      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5229
5230 -    goto/16 :goto_3e0
5231 +    goto/16 :goto_3e5
5232
5233 -    :catch_817
5234 +    :catch_81c
5235      move-exception v67
5236
5237      const-string v3, "making Content Service ready"
5238 @@ -2410,12 +2449,12 @@
5239
5240      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5241
5242 -    goto/16 :goto_3e5
5243 +    goto/16 :goto_3ea
5244
5245 -    :catch_823
5246 +    :catch_828
5247      move-exception v67
5248
5249 -    :goto_824
5250 +    :goto_829
5251      const-string v3, "starting Notification Manager"
5252
5253      move-object/from16 v0, p0
5254 @@ -2424,9 +2463,9 @@
5255
5256      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5257
5258 -    goto/16 :goto_405
5259 +    goto/16 :goto_40a
5260
5261 -    :catch_82f
5262 +    :catch_834
5263      move-exception v67
5264
5265      const-string v3, "starting DeviceStorageMonitor service"
5266 @@ -2437,12 +2476,12 @@
5267
5268      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5269
5270 -    goto/16 :goto_416
5271 +    goto/16 :goto_41b
5272
5273 -    :catch_83b
5274 +    :catch_840
5275      move-exception v67
5276
5277 -    :goto_83c
5278 +    :goto_841
5279      const-string v3, "starting Location Manager"
5280
5281      move-object/from16 v0, p0
5282 @@ -2451,12 +2490,12 @@
5283
5284      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5285
5286 -    goto/16 :goto_42d
5287 +    goto/16 :goto_432
5288
5289 -    :catch_847
5290 +    :catch_84c
5291      move-exception v67
5292
5293 -    :goto_848
5294 +    :goto_84d
5295      const-string v3, "starting Country Detector"
5296
5297      move-object/from16 v0, p0
5298 @@ -2465,9 +2504,9 @@
5299
5300      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5301
5302 -    goto/16 :goto_444
5303 +    goto/16 :goto_449
5304
5305 -    :catch_853
5306 +    :catch_858
5307      move-exception v67
5308
5309      const-string v3, "starting Search Service"
5310 @@ -2478,9 +2517,9 @@
5311
5312      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5313
5314 -    goto/16 :goto_455
5315 +    goto/16 :goto_45a
5316
5317 -    :catch_85f
5318 +    :catch_864
5319      move-exception v67
5320
5321      const-string v3, "starting DropBoxManagerService"
5322 @@ -2491,12 +2530,12 @@
5323
5324      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5325
5326 -    goto/16 :goto_46d
5327 +    goto/16 :goto_472
5328
5329 -    :catch_86b
5330 +    :catch_870
5331      move-exception v67
5332
5333 -    :goto_86c
5334 +    :goto_871
5335      const-string v3, "starting Wallpaper Service"
5336
5337      move-object/from16 v0, p0
5338 @@ -2505,9 +2544,9 @@
5339
5340      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5341
5342 -    goto/16 :goto_493
5343 +    goto/16 :goto_498
5344
5345 -    :catch_877
5346 +    :catch_87c
5347      move-exception v67
5348
5349      const-string v3, "starting Audio Service"
5350 @@ -2518,9 +2557,9 @@
5351
5352      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5353
5354 -    goto/16 :goto_4b2
5355 +    goto/16 :goto_4b7
5356
5357 -    :catch_883
5358 +    :catch_888
5359      move-exception v67
5360
5361      const-string v3, "starting DockObserver"
5362 @@ -2531,9 +2570,9 @@
5363
5364      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5365
5366 -    goto/16 :goto_4c2
5367 +    goto/16 :goto_4c7
5368
5369 -    :catch_88f
5370 +    :catch_894
5371      move-exception v67
5372
5373      const-string v3, "starting WiredAccessoryObserver"
5374 @@ -2544,12 +2583,12 @@
5375
5376      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5377
5378 -    goto/16 :goto_4ce
5379 +    goto/16 :goto_4d3
5380
5381 -    :catch_89b
5382 +    :catch_8a0
5383      move-exception v67
5384
5385 -    :goto_89c
5386 +    :goto_8a1
5387      const-string v3, "starting UsbService"
5388
5389      move-object/from16 v0, p0
5390 @@ -2558,12 +2597,12 @@
5391
5392      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5393
5394 -    goto/16 :goto_4e5
5395 +    goto/16 :goto_4ea
5396
5397 -    :catch_8a7
5398 +    :catch_8ac
5399      move-exception v67
5400
5401 -    :goto_8a8
5402 +    :goto_8ad
5403      const-string v3, "SystemServer"
5404
5405      const-string v9, "Failure starting SerialService"
5406 @@ -2572,9 +2611,9 @@
5407
5408      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5409
5410 -    goto/16 :goto_4fc
5411 +    goto/16 :goto_501
5412
5413 -    :catch_8b3
5414 +    :catch_8b8
5415      move-exception v67
5416
5417      const-string v3, "starting UiModeManagerService"
5418 @@ -2585,9 +2624,9 @@
5419
5420      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5421
5422 -    goto/16 :goto_50c
5423 +    goto/16 :goto_511
5424
5425 -    :catch_8bf
5426 +    :catch_8c4
5427      move-exception v67
5428
5429      const-string v3, "SystemServer"
5430 @@ -2598,12 +2637,12 @@
5431
5432      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5433
5434 -    goto/16 :goto_51d
5435 +    goto/16 :goto_522
5436
5437 -    :catch_8cb
5438 +    :catch_8d0
5439      move-exception v67
5440
5441 -    :goto_8cc
5442 +    :goto_8d1
5443      const-string v3, "starting AppWidget Service"
5444
5445      move-object/from16 v0, p0
5446 @@ -2612,9 +2651,9 @@
5447
5448      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5449
5450 -    goto/16 :goto_534
5451 +    goto/16 :goto_539
5452
5453 -    :catch_8d7
5454 +    :catch_8dc
5455      move-exception v67
5456
5457      const-string v3, "starting Recognition Service"
5458 @@ -2625,9 +2664,9 @@
5459
5460      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5461
5462 -    goto/16 :goto_544
5463 +    goto/16 :goto_549
5464
5465 -    :catch_8e3
5466 +    :catch_8e8
5467      move-exception v67
5468
5469      const-string v3, "starting DiskStats Service"
5470 @@ -2638,9 +2677,9 @@
5471
5472      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5473
5474 -    goto/16 :goto_555
5475 +    goto/16 :goto_55a
5476
5477 -    :catch_8ef
5478 +    :catch_8f4
5479      move-exception v67
5480
5481      const-string v3, "starting SamplingProfiler Service"
5482 @@ -2651,9 +2690,9 @@
5483
5484      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5485
5486 -    goto/16 :goto_566
5487 +    goto/16 :goto_56b
5488
5489 -    :catch_8fb
5490 +    :catch_900
5491      move-exception v67
5492
5493      const-string v3, "starting NetworkTimeUpdate service"
5494 @@ -2664,12 +2703,12 @@
5495
5496      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5497
5498 -    goto/16 :goto_576
5499 +    goto/16 :goto_57b
5500
5501 -    :catch_907
5502 +    :catch_90c
5503      move-exception v67
5504
5505 -    :goto_908
5506 +    :goto_90d
5507      const-string v3, "starting CommonTimeManagementService service"
5508
5509      move-object/from16 v0, p0
5510 @@ -2678,9 +2717,9 @@
5511
5512      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5513
5514 -    goto/16 :goto_58d
5515 +    goto/16 :goto_592
5516
5517 -    :catch_913
5518 +    :catch_918
5519      move-exception v67
5520
5521      const-string v3, "starting CertBlacklister"
5522 @@ -2691,12 +2730,12 @@
5523
5524      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5525
5526 -    goto/16 :goto_599
5527 +    goto/16 :goto_59e
5528
5529 -    :catch_91f
5530 +    :catch_924
5531      move-exception v67
5532
5533 -    :goto_920
5534 +    :goto_925
5535      const-string v3, "starting DreamManagerService"
5536
5537      move-object/from16 v0, p0
5538 @@ -2705,18 +2744,18 @@
5539
5540      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5541
5542 -    goto/16 :goto_5bd
5543 +    goto/16 :goto_5c2
5544
5545 -    :cond_92b
5546 +    :cond_930
5547      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5548
5549      move-result-object v3
5550
5551      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5552
5553 -    goto/16 :goto_5d4
5554 +    goto/16 :goto_5d9
5555
5556 -    :catch_934
5557 +    :catch_939
5558      move-exception v67
5559
5560      const-string v3, "making Vibrator Service ready"
5561 @@ -2727,9 +2766,9 @@
5562
5563      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5564
5565 -    goto/16 :goto_5d7
5566 +    goto/16 :goto_5dc
5567
5568 -    :catch_940
5569 +    :catch_945
5570      move-exception v67
5571
5572      const-string v3, "making Device Policy Service ready"
5573 @@ -2740,9 +2779,9 @@
5574
5575      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5576
5577 -    goto/16 :goto_5dc
5578 +    goto/16 :goto_5e1
5579
5580 -    :catch_94c
5581 +    :catch_951
5582      move-exception v67
5583
5584      const-string v3, "making Notification Service ready"
5585 @@ -2753,9 +2792,9 @@
5586
5587      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5588
5589 -    goto/16 :goto_5e1
5590 +    goto/16 :goto_5e6
5591
5592 -    :catch_958
5593 +    :catch_95d
5594      move-exception v67
5595
5596      const-string v3, "making Window Manager Service ready"
5597 @@ -2766,9 +2805,9 @@
5598
5599      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5600
5601 -    goto/16 :goto_5e4
5602 +    goto/16 :goto_5e9
5603
5604 -    :catch_964
5605 +    :catch_969
5606      move-exception v67
5607
5608      const-string v3, "making Package Manager Service ready"
5609 @@ -2779,9 +2818,9 @@
5610
5611      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5612
5613 -    goto/16 :goto_618
5614 +    goto/16 :goto_61d
5615
5616 -    :catch_970
5617 +    :catch_975
5618      move-exception v67
5619
5620      const-string v3, "making Lock Settings Service ready"
5621 @@ -2792,164 +2831,164 @@
5622
5623      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5624
5625 -    goto/16 :goto_61b
5626 +    goto/16 :goto_620
5627
5628 -    :catch_97c
5629 +    :catch_981
5630      move-exception v3
5631
5632      goto/16 :goto_126
5633
5634 -    :catch_97f
5635 +    :catch_984
5636      move-exception v67
5637
5638      move-object/from16 v65, v66
5639
5640 -    goto :goto_920
5641 +    goto :goto_925
5642
5643 -    :catch_983
5644 +    :catch_988
5645      move-exception v67
5646
5647      move-object/from16 v52, v53
5648
5649 -    goto :goto_908
5650 +    goto :goto_90d
5651
5652 -    :catch_987
5653 +    :catch_98c
5654      move-exception v67
5655
5656      move-object/from16 v44, v45
5657
5658 -    goto/16 :goto_8cc
5659 +    goto/16 :goto_8d1
5660
5661 -    :catch_98c
5662 +    :catch_991
5663      move-exception v67
5664
5665      move-object/from16 v96, v97
5666
5667 -    goto/16 :goto_8a8
5668 +    goto/16 :goto_8ad
5669
5670 -    :catch_991
5671 +    :catch_996
5672      move-exception v67
5673
5674      move-object/from16 v108, v109
5675
5676 -    goto/16 :goto_89c
5677 +    goto/16 :goto_8a1
5678
5679 -    :catch_996
5680 +    :catch_99b
5681      move-exception v67
5682
5683      move-object/from16 v113, v114
5684
5685 -    goto/16 :goto_86c
5686 +    goto/16 :goto_871
5687
5688 -    :catch_99b
5689 +    :catch_9a0
5690      move-exception v67
5691
5692      move-object/from16 v58, v59
5693
5694 -    goto/16 :goto_848
5695 +    goto/16 :goto_84d
5696
5697 -    :catch_9a0
5698 +    :catch_9a5
5699      move-exception v67
5700
5701      move-object/from16 v76, v77
5702
5703 -    goto/16 :goto_83c
5704 +    goto/16 :goto_841
5705
5706 -    :catch_9a5
5707 +    :catch_9aa
5708      move-exception v67
5709
5710      move-object/from16 v87, v88
5711
5712 -    goto/16 :goto_824
5713 +    goto/16 :goto_829
5714
5715 -    :catch_9aa
5716 +    :catch_9af
5717      move-exception v67
5718
5719      move-object/from16 v102, v103
5720
5721 -    goto/16 :goto_7f4
5722 +    goto/16 :goto_7f9
5723
5724 -    :catch_9af
5725 +    :catch_9b4
5726      move-exception v67
5727
5728      move-object/from16 v55, v56
5729
5730 -    goto/16 :goto_7dc
5731 +    goto/16 :goto_7e1
5732
5733 -    :catch_9b4
5734 +    :catch_9b9
5735      move-exception v67
5736
5737      move-object/from16 v115, v116
5738
5739 -    goto/16 :goto_7d0
5740 +    goto/16 :goto_7d5
5741
5742 -    :catch_9b9
5743 +    :catch_9be
5744      move-exception v67
5745
5746      move-object/from16 v117, v118
5747
5748 -    goto/16 :goto_7c4
5749 +    goto/16 :goto_7c9
5750
5751 -    :catch_9be
5752 +    :catch_9c3
5753      move-exception v67
5754
5755 -    goto/16 :goto_7b8
5756 +    goto/16 :goto_7bd
5757
5758 -    :catch_9c1
5759 +    :catch_9c6
5760      move-exception v67
5761
5762      move-object/from16 v12, v84
5763
5764 -    goto/16 :goto_7aa
5765 +    goto/16 :goto_7af
5766
5767 -    :catch_9c6
5768 +    :catch_9cb
5769      move-exception v67
5770
5771      move-object/from16 v104, v105
5772
5773 -    goto/16 :goto_79e
5774 +    goto/16 :goto_7a3
5775
5776 -    :catch_9cb
5777 +    :catch_9d0
5778      move-exception v67
5779
5780      move-object/from16 v100, v101
5781
5782 -    goto/16 :goto_77a
5783 +    goto/16 :goto_77f
5784
5785 -    :catch_9d0
5786 +    :catch_9d5
5787      move-exception v67
5788
5789      move-object/from16 v61, v62
5790
5791 -    goto/16 :goto_76e
5792 +    goto/16 :goto_773
5793
5794 -    :catch_9d5
5795 +    :catch_9da
5796      move-exception v67
5797
5798      move-object/from16 v78, v79
5799
5800 -    goto/16 :goto_762
5801 +    goto/16 :goto_767
5802
5803 -    :catch_9da
5804 +    :catch_9df
5805      move-exception v67
5806
5807      move-object/from16 v81, v82
5808
5809 -    goto/16 :goto_756
5810 +    goto/16 :goto_75b
5811
5812 -    :catch_9df
5813 +    :catch_9e4
5814      move-exception v3
5815
5816 -    goto/16 :goto_26e
5817 +    goto/16 :goto_273
5818
5819 -    :catch_9e2
5820 +    :catch_9e7
5821      move-exception v67
5822
5823      move-object/from16 v71, v72
5824
5825 -    goto/16 :goto_726
5826 +    goto/16 :goto_72b
5827
5828 -    :catch_9e7
5829 +    :catch_9ec
5830      move-exception v67
5831
5832      move-object/from16 v7, v43
5833 @@ -2958,9 +2997,9 @@
5834
5835      move-object/from16 v6, v91
5836
5837 -    goto/16 :goto_6a6
5838 +    goto/16 :goto_6ab
5839
5840 -    :catch_9f0
5841 +    :catch_9f5
5842      move-exception v67
5843
5844      move-object/from16 v7, v43
5845 @@ -2969,9 +3008,9 @@
5846
5847      move-object/from16 v41, v42
5848
5849 -    goto/16 :goto_6a6
5850 +    goto/16 :goto_6ab
5851
5852 -    :catch_9f9
5853 +    :catch_9fe
5854      move-exception v67
5855
5856      move-object/from16 v7, v43
5857 @@ -2980,18 +3019,18 @@
5858
5859      move-object/from16 v74, v75
5860
5861 -    goto/16 :goto_6a6
5862 +    goto/16 :goto_6ab
5863
5864 -    :catch_a02
5865 +    :catch_a07
5866      move-exception v67
5867
5868      move-object/from16 v7, v43
5869
5870      move-object/from16 v74, v75
5871
5872 -    goto/16 :goto_6a6
5873 +    goto/16 :goto_6ab
5874
5875 -    :catch_a09
5876 +    :catch_a0e
5877      move-exception v67
5878
5879      move-object/from16 v7, v43
5880 @@ -3000,9 +3039,9 @@
5881
5882      move-object/from16 v74, v75
5883
5884 -    goto/16 :goto_6a6
5885 +    goto/16 :goto_6ab
5886
5887 -    :catch_a12
5888 +    :catch_a17
5889      move-exception v67
5890
5891      move-object/from16 v47, v48
5892 @@ -3011,9 +3050,9 @@
5893
5894      move-object/from16 v74, v75
5895
5896 -    goto/16 :goto_6a6
5897 +    goto/16 :goto_6ab
5898
5899 -    :catch_a1b
5900 +    :catch_a20
5901      move-exception v67
5902
5903      move-object/from16 v49, v50
5904 @@ -3024,17 +3063,17 @@
5905
5906      move-object/from16 v74, v75
5907
5908 -    goto/16 :goto_6a6
5909 +    goto/16 :goto_6ab
5910
5911 -    :catch_a26
5912 +    :catch_a2b
5913      move-exception v67
5914
5915      move-object/from16 v41, v42
5916
5917 -    goto/16 :goto_696
5918 +    goto/16 :goto_69b
5919
5920 -    :cond_a2b
5921 +    :cond_a30
5922      move-object/from16 v8, v83
5923
5924 -    goto/16 :goto_5bd
5925 +    goto/16 :goto_5c2
5926  .end method
5927 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali ext-services/smali/com/android/server/TelephonyRegistry$1.smali
5928 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali   2012-10-19 15:30:51.873516329 -0500
5929 +++ ext-services/smali/com/android/server/TelephonyRegistry$1.smali     1969-12-31 18:00:00.000000000 -0600
5930 @@ -1,14 +0,0 @@
5931 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
5932 -.super Ljava/lang/Object;
5933 -.source "TelephonyRegistry.java"
5934 -
5935 -
5936 -# annotations
5937 -.annotation system Ldalvik/annotation/EnclosingClass;
5938 -    value = Lcom/android/server/TelephonyRegistry;
5939 -.end annotation
5940 -
5941 -.annotation system Ldalvik/annotation/InnerClass;
5942 -    accessFlags = 0x1008
5943 -    name = null
5944 -.end annotation
5945 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali ext-services/smali/com/android/server/TelephonyRegistry$Record.smali
5946 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali      2012-10-19 15:30:51.873516329 -0500
5947 +++ ext-services/smali/com/android/server/TelephonyRegistry$Record.smali        2012-10-19 15:30:39.793456428 -0500
5948 @@ -1,4 +1,4 @@
5949 -.class Lcom/android/server/TelephonyRegistry$Record;
5950 +.class public Lcom/android/server/TelephonyRegistry$Record;
5951  .super Ljava/lang/Object;
5952  .source "TelephonyRegistry.java"
5953
5954 @@ -9,7 +9,7 @@
5955  .end annotation
5956
5957  .annotation system Ldalvik/annotation/InnerClass;
5958 -    accessFlags = 0xa
5959 +    accessFlags = 0x9
5960      name = "Record"
5961  .end annotation
5962
5963 @@ -25,18 +25,10 @@
5964
5965
5966  # direct methods
5967 -.method private constructor <init>()V
5968 +.method public constructor <init>()V
5969      .registers 1
5970
5971      invoke-direct {p0}, Ljava/lang/Object;-><init>()V
5972
5973      return-void
5974  .end method
5975 -
5976 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
5977 -    .registers 2
5978 -
5979 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
5980 -
5981 -    return-void
5982 -.end method
5983 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali ext-services/smali/com/android/server/TelephonyRegistry.smali
5984 --- stock-services/smali/com/android/server/TelephonyRegistry.smali     2012-10-19 15:30:51.925516587 -0500
5985 +++ ext-services/smali/com/android/server/TelephonyRegistry.smali       2012-10-19 15:30:39.661455779 -0500
5986 @@ -6,7 +6,6 @@
5987  # annotations
5988  .annotation system Ldalvik/annotation/MemberClasses;
5989      value = {
5990 -        Lcom/android/server/TelephonyRegistry$1;,
5991          Lcom/android/server/TelephonyRegistry$Record;
5992      }
5993  .end annotation
5994 @@ -23,15 +22,15 @@
5995  # instance fields
5996  .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
5997
5998 -.field private mCallForwarding:Z
5999 +.field protected mCallForwarding:Z
6000
6001 -.field private mCallIncomingNumber:Ljava/lang/String;
6002 +.field protected mCallIncomingNumber:Ljava/lang/String;
6003
6004 -.field private mCallState:I
6005 +.field protected mCallState:I
6006
6007 -.field private mCellInfo:Landroid/telephony/CellInfo;
6008 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6009
6010 -.field private mCellLocation:Landroid/os/Bundle;
6011 +.field protected mCellLocation:Landroid/os/Bundle;
6012
6013  .field private mConnectedApns:Ljava/util/ArrayList;
6014      .annotation system Ldalvik/annotation/Signature;
6015 @@ -44,9 +43,9 @@
6016      .end annotation
6017  .end field
6018
6019 -.field private final mContext:Landroid/content/Context;
6020 +.field protected final mContext:Landroid/content/Context;
6021
6022 -.field private mDataActivity:I
6023 +.field protected mDataActivity:I
6024
6025  .field private mDataConnectionApn:Ljava/lang/String;
6026
6027 @@ -54,19 +53,19 @@
6028
6029  .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6030
6031 -.field private mDataConnectionNetworkType:I
6032 +.field protected mDataConnectionNetworkType:I
6033
6034  .field private mDataConnectionPossible:Z
6035
6036  .field private mDataConnectionReason:Ljava/lang/String;
6037
6038 -.field private mDataConnectionState:I
6039 +.field protected mDataConnectionState:I
6040
6041 -.field private mMessageWaiting:Z
6042 +.field protected mMessageWaiting:Z
6043
6044 -.field private mOtaspMode:I
6045 +.field protected mOtaspMode:I
6046
6047 -.field private final mRecords:Ljava/util/ArrayList;
6048 +.field protected final mRecords:Ljava/util/ArrayList;
6049      .annotation system Ldalvik/annotation/Signature;
6050          value = {
6051              "Ljava/util/ArrayList",
6052 @@ -77,7 +76,7 @@
6053      .end annotation
6054  .end field
6055
6056 -.field private final mRemoveList:Ljava/util/ArrayList;
6057 +.field protected final mRemoveList:Ljava/util/ArrayList;
6058      .annotation system Ldalvik/annotation/Signature;
6059          value = {
6060              "Ljava/util/ArrayList",
6061 @@ -88,13 +87,13 @@
6062      .end annotation
6063  .end field
6064
6065 -.field private mServiceState:Landroid/telephony/ServiceState;
6066 +.field protected mServiceState:Landroid/telephony/ServiceState;
6067
6068 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6069 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6070
6071
6072  # direct methods
6073 -.method constructor <init>(Landroid/content/Context;)V
6074 +.method protected constructor <init>(Landroid/content/Context;)V
6075      .registers 5
6076
6077      const/4 v2, 0x0
6078 @@ -381,8 +380,8 @@
6079      return-void
6080  .end method
6081
6082 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6083 -    .registers 8
6084 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6085 +    .registers 7
6086
6087      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6088
6089 @@ -391,29 +390,29 @@
6090      :try_start_4
6091      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6092
6093 -    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6094 -
6095 -    move-result v5
6096 -
6097 -    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6098 -    :try_end_d
6099 -    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6100 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6101 +    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6102 +    :try_end_9
6103 +    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6104 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6105
6106 -    :goto_d
6107 +    :goto_9
6108      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6109
6110      new-instance v3, Landroid/content/Intent;
6111
6112 -    const-string v4, "android.intent.action.SERVICE_STATE"
6113 +    const-string v4, "android.intent.action.SIG_STR"
6114
6115      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6116
6117 +    const/high16 v4, 0x2000
6118 +
6119 +    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6120 +
6121      new-instance v0, Landroid/os/Bundle;
6122
6123      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6124
6125 -    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6126 +    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6127
6128      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6129
6130 @@ -423,21 +422,23 @@
6131
6132      return-void
6133
6134 -    :catchall_28
6135 +    :catchall_29
6136      move-exception v4
6137
6138      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6139
6140      throw v4
6141
6142 -    :catch_2d
6143 +    :catch_2e
6144      move-exception v4
6145
6146 -    goto :goto_d
6147 +    goto :goto_9
6148  .end method
6149
6150 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6151 -    .registers 7
6152 +
6153 +# virtual methods
6154 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6155 +    .registers 8
6156
6157      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6158
6159 @@ -446,29 +447,29 @@
6160      :try_start_4
6161      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6162
6163 -    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6164 -    :try_end_9
6165 -    .catchall {:try_start_4 .. :try_end_9} :catchall_29
6166 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6167 +    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6168
6169 -    :goto_9
6170 +    move-result v5
6171 +
6172 +    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6173 +    :try_end_d
6174 +    .catchall {:try_start_4 .. :try_end_d} :catchall_28
6175 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6176 +
6177 +    :goto_d
6178      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6179
6180      new-instance v3, Landroid/content/Intent;
6181
6182 -    const-string v4, "android.intent.action.SIG_STR"
6183 +    const-string v4, "android.intent.action.SERVICE_STATE"
6184
6185      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6186
6187 -    const/high16 v4, 0x2000
6188 -
6189 -    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6190 -
6191      new-instance v0, Landroid/os/Bundle;
6192
6193      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6194
6195 -    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6196 +    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6197
6198      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6199
6200 @@ -478,20 +479,20 @@
6201
6202      return-void
6203
6204 -    :catchall_29
6205 +    :catchall_28
6206      move-exception v4
6207
6208      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6209
6210      throw v4
6211
6212 -    :catch_2e
6213 +    :catch_2d
6214      move-exception v4
6215
6216 -    goto :goto_9
6217 +    goto :goto_d
6218  .end method
6219
6220 -.method private checkListenerPermission(I)V
6221 +.method protected checkListenerPermission(I)V
6222      .registers 5
6223
6224      const/4 v2, 0x0
6225 @@ -532,7 +533,7 @@
6226      return-void
6227  .end method
6228
6229 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6230 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6231      .registers 5
6232
6233      iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6234 @@ -602,111 +603,6 @@
6235      goto :goto_b
6236  .end method
6237
6238 -.method private handleRemoveListLocked()V
6239 -    .registers 4
6240 -
6241 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6242 -
6243 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6244 -
6245 -    move-result v2
6246 -
6247 -    if-lez v2, :cond_23
6248 -
6249 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6250 -
6251 -    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6252 -
6253 -    move-result-object v1
6254 -
6255 -    :goto_e
6256 -    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6257 -
6258 -    move-result v2
6259 -
6260 -    if-eqz v2, :cond_1e
6261 -
6262 -    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6263 -
6264 -    move-result-object v0
6265 -
6266 -    check-cast v0, Landroid/os/IBinder;
6267 -
6268 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6269 -
6270 -    goto :goto_e
6271 -
6272 -    :cond_1e
6273 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6274 -
6275 -    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6276 -
6277 -    :cond_23
6278 -    return-void
6279 -.end method
6280 -
6281 -.method private remove(Landroid/os/IBinder;)V
6282 -    .registers 6
6283 -
6284 -    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6285 -
6286 -    monitor-enter v3
6287 -
6288 -    :try_start_3
6289 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6290 -
6291 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6292 -
6293 -    move-result v1
6294 -
6295 -    const/4 v0, 0x0
6296 -
6297 -    :goto_a
6298 -    if-ge v0, v1, :cond_22
6299 -
6300 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6301 -
6302 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6303 -
6304 -    move-result-object v2
6305 -
6306 -    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6307 -
6308 -    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6309 -
6310 -    if-ne v2, p1, :cond_1f
6311 -
6312 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6313 -
6314 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6315 -
6316 -    monitor-exit v3
6317 -
6318 -    :goto_1e
6319 -    return-void
6320 -
6321 -    :cond_1f
6322 -    add-int/lit8 v0, v0, 0x1
6323 -
6324 -    goto :goto_a
6325 -
6326 -    :cond_22
6327 -    monitor-exit v3
6328 -
6329 -    goto :goto_1e
6330 -
6331 -    :catchall_24
6332 -    move-exception v2
6333 -
6334 -    monitor-exit v3
6335 -    :try_end_26
6336 -    .catchall {:try_start_3 .. :try_end_26} :catchall_24
6337 -
6338 -    throw v2
6339 -.end method
6340 -
6341 -
6342 -# virtual methods
6343  .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6344      .registers 10
6345
6346 @@ -1204,12 +1100,55 @@
6347      goto/16 :goto_32
6348  .end method
6349
6350 +.method protected handleRemoveListLocked()V
6351 +    .registers 4
6352 +
6353 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6354 +
6355 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6356 +
6357 +    move-result v2
6358 +
6359 +    if-lez v2, :cond_23
6360 +
6361 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6362 +
6363 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6364 +
6365 +    move-result-object v1
6366 +
6367 +    :goto_e
6368 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6369 +
6370 +    move-result v2
6371 +
6372 +    if-eqz v2, :cond_1e
6373 +
6374 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6375 +
6376 +    move-result-object v0
6377 +
6378 +    check-cast v0, Landroid/os/IBinder;
6379 +
6380 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6381 +
6382 +    goto :goto_e
6383 +
6384 +    :cond_1e
6385 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6386 +
6387 +    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6388 +
6389 +    :cond_23
6390 +    return-void
6391 +.end method
6392 +
6393  .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6394      .registers 17
6395
6396 -    if-eqz p3, :cond_133
6397 +    if-eqz p3, :cond_131
6398
6399 -    invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6400 +    invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6401
6402      iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6403
6404 @@ -1226,7 +1165,7 @@
6405
6406      invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6407      :try_end_12
6408 -    .catchall {:try_start_9 .. :try_end_12} :catchall_db
6409 +    .catchall {:try_start_9 .. :try_end_12} :catchall_da
6410
6411      move-result v0
6412
6413 @@ -1246,7 +1185,7 @@
6414
6415      check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6416      :try_end_1f
6417 -    .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6418 +    .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6419
6420      :try_start_1f
6421      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6422 @@ -1262,7 +1201,7 @@
6423
6424      iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6425      :try_end_2a
6426 -    .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6427 +    .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6428
6429      if-eqz p4, :cond_c1
6430
6431 @@ -1281,8 +1220,8 @@
6432
6433      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6434      :try_end_3c
6435 -    .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6436 -    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6437 +    .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6438 +    .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6439
6440      :cond_3c
6441      :goto_3c
6442 @@ -1308,8 +1247,8 @@
6443      :cond_4d
6444      invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6445      :try_end_50
6446 -    .catchall {:try_start_40 .. :try_end_50} :catchall_db
6447 -    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6448 +    .catchall {:try_start_40 .. :try_end_50} :catchall_da
6449 +    .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6450
6451      :cond_50
6452      :goto_50
6453 @@ -1324,8 +1263,8 @@
6454
6455      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6456      :try_end_5b
6457 -    .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6458 -    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6459 +    .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6460 +    .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6461
6462      :cond_5b
6463      :goto_5b
6464 @@ -1340,8 +1279,8 @@
6465
6466      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6467      :try_end_66
6468 -    .catchall {:try_start_5f .. :try_end_66} :catchall_db
6469 -    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6470 +    .catchall {:try_start_5f .. :try_end_66} :catchall_da
6471 +    .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6472
6473      :cond_66
6474      :goto_66
6475 @@ -1360,8 +1299,8 @@
6476
6477      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6478      :try_end_76
6479 -    .catchall {:try_start_6a .. :try_end_76} :catchall_db
6480 -    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6481 +    .catchall {:try_start_6a .. :try_end_76} :catchall_da
6482 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6483
6484      :cond_76
6485      :goto_76
6486 @@ -1378,8 +1317,8 @@
6487
6488      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6489      :try_end_83
6490 -    .catchall {:try_start_7a .. :try_end_83} :catchall_db
6491 -    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6492 +    .catchall {:try_start_7a .. :try_end_83} :catchall_da
6493 +    .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6494
6495      :cond_83
6496      :goto_83
6497 @@ -1396,8 +1335,8 @@
6498
6499      invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6500      :try_end_90
6501 -    .catchall {:try_start_87 .. :try_end_90} :catchall_db
6502 -    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6503 +    .catchall {:try_start_87 .. :try_end_90} :catchall_da
6504 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6505
6506      :cond_90
6507      :goto_90
6508 @@ -1412,8 +1351,8 @@
6509
6510      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6511      :try_end_9b
6512 -    .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6513 -    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6514 +    .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6515 +    .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6516
6517      :cond_9b
6518      :goto_9b
6519 @@ -1428,8 +1367,8 @@
6520
6521      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6522      :try_end_a6
6523 -    .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6524 -    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6525 +    .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6526 +    .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6527
6528      :cond_a6
6529      :goto_a6
6530 @@ -1444,8 +1383,8 @@
6531
6532      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6533      :try_end_b1
6534 -    .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6535 -    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6536 +    .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6537 +    .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6538
6539      :cond_b1
6540      :goto_b1
6541 @@ -1464,15 +1403,15 @@
6542
6543      invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6544      :try_end_c1
6545 -    .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6546 -    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6547 +    .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6548 +    .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6549
6550      :cond_c1
6551      :goto_c1
6552      :try_start_c1
6553      monitor-exit v9
6554      :try_end_c2
6555 -    .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6556 +    .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6557
6558      :goto_c2
6559      return-void
6560 @@ -1488,13 +1427,11 @@
6561      :try_start_c8
6562      new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6563
6564 -    const/4 v8, 0x0
6565 -
6566 -    invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6567 -    :try_end_ce
6568 -    .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6569 +    invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6570 +    :try_end_cd
6571 +    .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6572
6573 -    :try_start_ce
6574 +    :try_start_cd
6575      iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6576
6577      iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6578 @@ -1507,133 +1444,133 @@
6579
6580      goto/16 :goto_23
6581
6582 -    :catchall_db
6583 +    :catchall_da
6584      move-exception v8
6585
6586 -    :goto_dc
6587 +    :goto_db
6588      monitor-exit v9
6589 -    :try_end_dd
6590 -    .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6591 +    :try_end_dc
6592 +    .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6593
6594      throw v8
6595
6596 -    :catch_de
6597 +    :catch_dd
6598      move-exception v2
6599
6600 -    :try_start_df
6601 +    :try_start_de
6602      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6603
6604 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6605 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6606
6607      goto/16 :goto_3c
6608
6609 -    :catch_e6
6610 +    :catch_e5
6611      move-exception v2
6612
6613      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6614
6615 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6616 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6617
6618      goto/16 :goto_50
6619
6620 -    :catch_ee
6621 +    :catch_ed
6622      move-exception v2
6623
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_5b
6630
6631 -    :catch_f6
6632 +    :catch_f5
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_66
6641
6642 -    :catch_fe
6643 +    :catch_fd
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_76
6652
6653 -    :catch_106
6654 +    :catch_105
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_83
6663
6664 -    :catch_10e
6665 +    :catch_10d
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_90
6674
6675 -    :catch_116
6676 +    :catch_115
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_9b
6685 +    goto :goto_9b
6686
6687 -    :catch_11e
6688 +    :catch_11c
6689      move-exception v2
6690
6691      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6692
6693 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6694 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6695
6696      goto :goto_a6
6697
6698 -    :catch_125
6699 +    :catch_123
6700      move-exception v2
6701
6702      iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6703
6704 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6705 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6706
6707      goto :goto_b1
6708
6709 -    :catch_12c
6710 +    :catch_12a
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 -    :try_end_132
6717 -    .catchall {:try_start_df .. :try_end_132} :catchall_db
6718 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6719 +    :try_end_130
6720 +    .catchall {:try_start_de .. :try_end_130} :catchall_da
6721
6722      goto :goto_c1
6723
6724 -    :cond_133
6725 +    :cond_131
6726      invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6727
6728      move-result-object v8
6729
6730 -    invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6731 +    invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6732
6733      goto :goto_c2
6734
6735 -    :catchall_13b
6736 +    :catchall_139
6737      move-exception v8
6738
6739      move-object v5, v6
6740
6741 -    goto :goto_dc
6742 +    goto :goto_db
6743  .end method
6744
6745  .method public notifyCallForwardingChanged(Z)V
6746 @@ -1641,7 +1578,7 @@
6747
6748      const-string v3, "notifyCallForwardingChanged()"
6749
6750 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6751 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6752
6753      move-result v3
6754
6755 @@ -1719,7 +1656,7 @@
6756
6757      :cond_38
6758      :try_start_38
6759 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6760 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6761
6762      monitor-exit v4
6763      :try_end_3c
6764 @@ -1733,7 +1670,7 @@
6765
6766      const-string v3, "notifyCallState()"
6767
6768 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6769 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6770
6771      move-result v3
6772
6773 @@ -1813,7 +1750,7 @@
6774
6775      :cond_3a
6776      :try_start_3a
6777 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6778 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6779
6780      monitor-exit v4
6781      :try_end_3e
6782 @@ -1829,7 +1766,7 @@
6783
6784      const-string v3, "notifyCellInfo()"
6785
6786 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6787 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6788
6789      move-result v3
6790
6791 @@ -1911,7 +1848,7 @@
6792
6793      :cond_3d
6794      :try_start_3d
6795 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6796 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6797
6798      monitor-exit v4
6799      :try_end_41
6800 @@ -1925,7 +1862,7 @@
6801
6802      const-string v3, "notifyCellLocation()"
6803
6804 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6805 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6806
6807      move-result v3
6808
6809 @@ -2007,7 +1944,7 @@
6810
6811      :cond_3d
6812      :try_start_3d
6813 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6814 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6815
6816      monitor-exit v4
6817      :try_end_41
6818 @@ -2021,7 +1958,7 @@
6819
6820      const-string v3, "notifyDataActivity()"
6821
6822 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6823 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6824
6825      move-result v3
6826
6827 @@ -2099,7 +2036,7 @@
6828
6829      :cond_38
6830      :try_start_38
6831 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6832 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6833
6834      monitor-exit v4
6835      :try_end_3c
6836 @@ -2113,7 +2050,7 @@
6837
6838      const-string v1, "notifyDataConnection()"
6839
6840 -    invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6841 +    invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6842
6843      move-result v1
6844
6845 @@ -2281,7 +2218,7 @@
6846      goto :goto_28
6847
6848      :cond_89
6849 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6850 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6851
6852      :cond_8c
6853      monitor-exit v2
6854 @@ -2316,7 +2253,7 @@
6855
6856      const-string v0, "notifyDataConnectionFailed()"
6857
6858 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6859 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6860
6861      move-result v0
6862
6863 @@ -2336,7 +2273,7 @@
6864
6865      const-string v3, "notifyMessageWaitingChanged()"
6866
6867 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6868 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6869
6870      move-result v3
6871
6872 @@ -2414,7 +2351,7 @@
6873
6874      :cond_38
6875      :try_start_38
6876 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6877 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6878
6879      monitor-exit v4
6880      :try_end_3c
6881 @@ -2428,7 +2365,7 @@
6882
6883      const-string v3, "notifyOtaspChanged()"
6884
6885 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6886 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6887
6888      move-result v3
6889
6890 @@ -2506,7 +2443,7 @@
6891
6892      :cond_38
6893      :try_start_38
6894 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6895 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6896
6897      monitor-exit v4
6898      :try_end_3c
6899 @@ -2516,11 +2453,11 @@
6900  .end method
6901
6902  .method public notifyServiceState(Landroid/telephony/ServiceState;)V
6903 -    .registers 8
6904 +    .registers 10
6905
6906      const-string v3, "notifyServiceState()"
6907
6908 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6909 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6910
6911      move-result v3
6912
6913 @@ -2537,19 +2474,29 @@
6914      :try_start_c
6915      iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6916
6917 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6918 +
6919 +    const-string v5, ""
6920 +
6921 +    const-string v6, ""
6922 +
6923 +    const-string v7, ""
6924 +
6925 +    invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6926 +
6927      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6928
6929      invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6930
6931      move-result-object v1
6932
6933 -    :cond_14
6934 -    :goto_14
6935 +    :cond_1f
6936 +    :goto_1f
6937      invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6938
6939      move-result v3
6940
6941 -    if-eqz v3, :cond_3d
6942 +    if-eqz v3, :cond_51
6943
6944      invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6945
6946 @@ -2558,14 +2505,22 @@
6947      check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6948
6949      iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
6950 -    :try_end_22
6951 -    .catchall {:try_start_c .. :try_end_22} :catchall_3a
6952 +    :try_end_2d
6953 +    .catchall {:try_start_c .. :try_end_2d} :catchall_4e
6954
6955      and-int/lit8 v3, v3, 0x1
6956
6957 -    if-eqz v3, :cond_14
6958 +    if-eqz v3, :cond_1f
6959 +
6960 +    :try_start_31
6961 +    const-string v3, ""
6962 +
6963 +    const-string v5, ""
6964 +
6965 +    const-string v6, ""
6966 +
6967 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6968
6969 -    :try_start_26
6970      iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6971
6972      new-instance v5, Landroid/telephony/ServiceState;
6973 @@ -2573,42 +2528,42 @@
6974      invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
6975
6976      invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6977 -    :try_end_30
6978 -    .catchall {:try_start_26 .. :try_end_30} :catchall_3a
6979 -    .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
6980 +    :try_end_44
6981 +    .catchall {:try_start_31 .. :try_end_44} :catchall_4e
6982 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
6983
6984 -    goto :goto_14
6985 +    goto :goto_1f
6986
6987 -    :catch_31
6988 +    :catch_45
6989      move-exception v0
6990
6991 -    :try_start_32
6992 +    :try_start_46
6993      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6994
6995      iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6996
6997      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
6998
6999 -    goto :goto_14
7000 +    goto :goto_1f
7001
7002 -    :catchall_3a
7003 +    :catchall_4e
7004      move-exception v3
7005
7006      monitor-exit v4
7007 -    :try_end_3c
7008 -    .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7009 +    :try_end_50
7010 +    .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7011
7012      throw v3
7013
7014 -    :cond_3d
7015 -    :try_start_3d
7016 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7017 +    :cond_51
7018 +    :try_start_51
7019 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7020
7021      monitor-exit v4
7022 -    :try_end_41
7023 -    .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7024 +    :try_end_55
7025 +    .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7026
7027 -    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7028 +    invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7029
7030      goto :goto_8
7031  .end method
7032 @@ -2618,7 +2573,7 @@
7033
7034      const-string v4, "notifySignalStrength()"
7035
7036 -    invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7037 +    invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7038
7039      move-result v4
7040
7041 @@ -2741,7 +2696,7 @@
7042      goto :goto_30
7043
7044      :cond_5a
7045 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7046 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7047
7048      monitor-exit v5
7049      :try_end_5e
7050 @@ -2751,3 +2706,63 @@
7051
7052      goto :goto_8
7053  .end method
7054 +
7055 +.method protected remove(Landroid/os/IBinder;)V
7056 +    .registers 6
7057 +
7058 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7059 +
7060 +    monitor-enter v3
7061 +
7062 +    :try_start_3
7063 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7064 +
7065 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7066 +
7067 +    move-result v1
7068 +
7069 +    const/4 v0, 0x0
7070 +
7071 +    :goto_a
7072 +    if-ge v0, v1, :cond_22
7073 +
7074 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7075 +
7076 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7077 +
7078 +    move-result-object v2
7079 +
7080 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7081 +
7082 +    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7083 +
7084 +    if-ne v2, p1, :cond_1f
7085 +
7086 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7087 +
7088 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7089 +
7090 +    monitor-exit v3
7091 +
7092 +    :goto_1e
7093 +    return-void
7094 +
7095 +    :cond_1f
7096 +    add-int/lit8 v0, v0, 0x1
7097 +
7098 +    goto :goto_a
7099 +
7100 +    :cond_22
7101 +    monitor-exit v3
7102 +
7103 +    goto :goto_1e
7104 +
7105 +    :catchall_24
7106 +    move-exception v2
7107 +
7108 +    monitor-exit v3
7109 +    :try_end_26
7110 +    .catchall {:try_start_3 .. :try_end_26} :catchall_24
7111 +
7112 +    throw v2
7113 +.end method