patches/openpdroid/4.3/.aosp-ever/20130810/services.patch

   1 diff -Npru stock-services/smali/com/android/server/am/BroadcastQueue.smali pdroid-services/smali/com/android/server/am/BroadcastQueue.smali
   2 --- stock-services/smali/com/android/server/am/BroadcastQueue.smali     2013-08-10 20:37:59.683214155 -0700
   3 +++ pdroid-services/smali/com/android/server/am/BroadcastQueue.smali    2013-08-10 20:37:57.243214052 -0700
   4 @@ -624,6 +624,118 @@
   5      goto :goto_170
   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;ZZI)V
 121      .registers 18
 122      .annotation system Ldalvik/annotation/Throws;
 123 @@ -2273,15 +2385,15 @@
 124  .end method
 125
 126  .method final processNextBroadcast(Z)V
 127 -    .registers 38
 128 +    .registers 39
 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 v35, v0
 135 +    move-object/from16 v36, v0
 136
 137 -    monitor-enter v35
 138 +    monitor-enter v36
 139
 140      :try_start_7
 141      move-object/from16 v0, p0
 142 @@ -2318,15 +2430,15 @@
 143
 144      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 145
 146 -    move-result-object v29
 147 +    move-result-object v30
 148
 149 -    check-cast v29, Lcom/android/server/am/BroadcastRecord;
 150 +    check-cast v30, 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, v29
 157 +    move-object/from16 v0, v30
 158
 159      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 160
 161 @@ -2334,11 +2446,11 @@
 162
 163      move-result-wide v5
 164
 165 -    move-object/from16 v0, v29
 166 +    move-object/from16 v0, v30
 167
 168      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
 169
 170 -    move-object/from16 v0, v29
 171 +    move-object/from16 v0, v30
 172
 173      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 174
 175 @@ -2346,43 +2458,43 @@
 176
 177      move-result v12
 178
 179 -    const/16 v18, 0x0
 180 +    const/16 v19, 0x0
 181
 182      :goto_44
 183 -    move/from16 v0, v18
 184 +    move/from16 v0, v19
 185
 186      if-ge v0, v12, :cond_61
 187
 188 -    move-object/from16 v0, v29
 189 +    move-object/from16 v0, v30
 190
 191      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 192
 193 -    move/from16 v0, v18
 194 +    move/from16 v0, v19
 195
 196      invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 197
 198 -    move-result-object v32
 199 +    move-result-object v33
 200
 201 -    check-cast v32, Lcom/android/server/am/BroadcastFilter;
 202 +    check-cast v33, Lcom/android/server/am/BroadcastFilter;
 203
 204      const/4 v3, 0x0
 205
 206      move-object/from16 v0, p0
 207
 208 -    move-object/from16 v1, v29
 209 +    move-object/from16 v1, v30
 210
 211 -    move-object/from16 v2, v32
 212 +    move-object/from16 v2, v33
 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 v18, v18, 0x1
 217 +    add-int/lit8 v19, v19, 0x1
 218
 219      goto :goto_44
 220
 221      :cond_61
 222      move-object/from16 v0, p0
 223
 224 -    move-object/from16 v1, v29
 225 +    move-object/from16 v1, v30
 226
 227      invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
 228
 229 @@ -2391,7 +2503,7 @@
 230      :catchall_69
 231      move-exception v3
 232
 233 -    monitor-exit v35
 234 +    monitor-exit v36
 235      :try_end_6b
 236      .catchall {:try_start_7 .. :try_end_6b} :catchall_69
 237
 238 @@ -2436,17 +2548,17 @@
 239
 240      if-nez v3, :cond_94
 241
 242 -    const/16 v20, 0x1
 243 +    const/16 v21, 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 v20, :cond_9a
 251 +    if-nez v21, :cond_9a
 252
 253      :try_start_92
 254 -    monitor-exit v35
 255 +    monitor-exit v36
 256      :try_end_93
 257      .catchall {:try_start_92 .. :try_end_93} :catchall_69
 258
 259 @@ -2454,7 +2566,7 @@
 260      return-void
 261
 262      :cond_94
 263 -    const/16 v20, 0x0
 264 +    const/16 v21, 0x0
 265
 266      goto :goto_8f
 267
 268 @@ -2543,7 +2655,7 @@
 269      iput-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
 270
 271      :cond_e2
 272 -    const/16 v22, 0x0
 273 +    const/16 v23, 0x0
 274
 275      :cond_e4
 276      move-object/from16 v0, p0
 277 @@ -2562,7 +2674,7 @@
 278
 279      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->scheduleAppGcsLocked()V
 280
 281 -    if-eqz v22, :cond_fe
 282 +    if-eqz v23, :cond_fe
 283
 284      move-object/from16 v0, p0
 285
 286 @@ -2571,7 +2683,7 @@
 287      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->updateOomAdjLocked()V
 288
 289      :cond_fe
 290 -    monitor-exit v35
 291 +    monitor-exit v36
 292
 293      goto :goto_93
 294
 295 @@ -2584,25 +2696,25 @@
 296
 297      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 298
 299 -    move-result-object v29
 300 +    move-result-object v30
 301
 302 -    check-cast v29, Lcom/android/server/am/BroadcastRecord;
 303 +    check-cast v30, Lcom/android/server/am/BroadcastRecord;
 304
 305 -    const/16 v17, 0x0
 306 +    const/16 v18, 0x0
 307
 308 -    move-object/from16 v0, v29
 309 +    move-object/from16 v0, v30
 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, v29
 316 +    move-object/from16 v0, v30
 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 v27
 323 +    move-result v28
 324
 325      :goto_11b
 326      move-object/from16 v0, p0
 327 @@ -2613,7 +2725,7 @@
 328
 329      if-eqz v3, :cond_1d4
 330
 331 -    move-object/from16 v0, v29
 332 +    move-object/from16 v0, v30
 333
 334      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 335
 336 @@ -2625,11 +2737,11 @@
 337
 338      invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 339
 340 -    move-result-wide v25
 341 +    move-result-wide v26
 342
 343 -    if-lez v27, :cond_1d4
 344 +    if-lez v28, :cond_1d4
 345
 346 -    move-object/from16 v0, v29
 347 +    move-object/from16 v0, v30
 348
 349      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 350
 351 @@ -2641,7 +2753,7 @@
 352
 353      mul-long/2addr v7, v9
 354
 355 -    move/from16 v0, v27
 356 +    move/from16 v0, v28
 357
 358      int-to-long v9, v0
 359
 360 @@ -2649,7 +2761,7 @@
 361
 362      add-long/2addr v5, v7
 363
 364 -    cmp-long v3, v25, v5
 365 +    cmp-long v3, v26, v5
 366
 367      if-lez v3, :cond_1d4
 368
 369 @@ -2685,7 +2797,7 @@
 370
 371      move-result-object v5
 372
 373 -    move-wide/from16 v0, v25
 374 +    move-wide/from16 v0, v26
 375
 376      invoke-virtual {v5, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 377
 378 @@ -2697,7 +2809,7 @@
 379
 380      move-result-object v5
 381
 382 -    move-object/from16 v0, v29
 383 +    move-object/from16 v0, v30
 384
 385      iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 386
 387 @@ -2711,7 +2823,7 @@
 388
 389      move-result-object v5
 390
 391 -    move-object/from16 v0, v29
 392 +    move-object/from16 v0, v30
 393
 394      iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 395
 396 @@ -2725,7 +2837,7 @@
 397
 398      move-result-object v5
 399
 400 -    move-object/from16 v0, v29
 401 +    move-object/from16 v0, v30
 402
 403      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 404
 405 @@ -2739,7 +2851,7 @@
 406
 407      move-result-object v5
 408
 409 -    move/from16 v0, v27
 410 +    move/from16 v0, v28
 411
 412      invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 413
 414 @@ -2751,7 +2863,7 @@
 415
 416      move-result-object v5
 417
 418 -    move-object/from16 v0, v29
 419 +    move-object/from16 v0, v30
 420
 421      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 422
 423 @@ -2765,7 +2877,7 @@
 424
 425      move-result-object v5
 426
 427 -    move-object/from16 v0, v29
 428 +    move-object/from16 v0, v30
 429
 430      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 431
 432 @@ -2785,55 +2897,55 @@
 433
 434      invoke-virtual {v0, v3}, Lcom/android/server/am/BroadcastQueue;->broadcastTimeoutLocked(Z)V
 435
 436 -    const/16 v17, 0x1
 437 +    const/16 v18, 0x1
 438
 439      const/4 v3, 0x0
 440
 441 -    move-object/from16 v0, v29
 442 +    move-object/from16 v0, v30
 443
 444      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 445
 446      :cond_1d4
 447 -    move-object/from16 v0, v29
 448 +    move-object/from16 v0, v30
 449
 450      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 451
 452      if-eqz v3, :cond_1e1
 453
 454 -    monitor-exit v35
 455 +    monitor-exit v36
 456
 457      goto/16 :goto_93
 458
 459      :cond_1dd
 460 -    const/16 v27, 0x0
 461 +    const/16 v28, 0x0
 462
 463      goto/16 :goto_11b
 464
 465      :cond_1e1
 466 -    move-object/from16 v0, v29
 467 +    move-object/from16 v0, v30
 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, v29
 474 +    move-object/from16 v0, v30
 475
 476      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 477
 478 -    move/from16 v0, v27
 479 +    move/from16 v0, v28
 480
 481      if-ge v3, v0, :cond_1f7
 482
 483 -    move-object/from16 v0, v29
 484 +    move-object/from16 v0, v30
 485
 486      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
 487
 488      if-nez v3, :cond_1f7
 489
 490 -    if-eqz v17, :cond_23e
 491 +    if-eqz v18, :cond_23e
 492
 493      :cond_1f7
 494 -    move-object/from16 v0, v29
 495 +    move-object/from16 v0, v30
 496
 497      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 498      :try_end_1fb
 499 @@ -2842,31 +2954,31 @@
 500      if-eqz v3, :cond_228
 501
 502      :try_start_1fd
 503 -    move-object/from16 v0, v29
 504 +    move-object/from16 v0, v30
 505
 506      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->callerApp:Lcom/android/server/am/ProcessRecord;
 507
 508 -    move-object/from16 v0, v29
 509 +    move-object/from16 v0, v30
 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, v29
 516 +    move-object/from16 v0, v30
 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, v29
 523 +    move-object/from16 v0, v30
 524
 525      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
 526
 527 -    move-object/from16 v0, v29
 528 +    move-object/from16 v0, v30
 529
 530      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
 531
 532 -    move-object/from16 v0, v29
 533 +    move-object/from16 v0, v30
 534
 535      iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
 536
 537 @@ -2874,7 +2986,7 @@
 538
 539      const/4 v10, 0x0
 540
 541 -    move-object/from16 v0, v29
 542 +    move-object/from16 v0, v30
 543
 544      iget v11, v0, Lcom/android/server/am/BroadcastRecord;->userId:I
 545
 546 @@ -2882,12 +2994,12 @@
 547
 548      const/4 v3, 0x0
 549
 550 -    move-object/from16 v0, v29
 551 +    move-object/from16 v0, v30
 552
 553      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 554      :try_end_228
 555      .catchall {:try_start_1fd .. :try_end_228} :catchall_69
 556 -    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_228} :catch_2b7
 557 +    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_228} :catch_2e8
 558
 559      :cond_228
 560      :goto_228
 561 @@ -2896,7 +3008,7 @@
 562
 563      move-object/from16 v0, p0
 564
 565 -    move-object/from16 v1, v29
 566 +    move-object/from16 v1, v30
 567
 568      invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
 569
 570 @@ -2908,22 +3020,22 @@
 571
 572      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
 573
 574 -    const/16 v29, 0x0
 575 +    const/16 v30, 0x0
 576
 577 -    const/16 v22, 0x1
 578 +    const/16 v23, 0x1
 579
 580      :cond_23e
 581 -    if-eqz v29, :cond_e4
 582 +    if-eqz v30, :cond_e4
 583
 584 -    move-object/from16 v0, v29
 585 +    move-object/from16 v0, v30
 586
 587      iget v0, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 588
 589 -    move/from16 v30, v0
 590 +    move/from16 v31, v0
 591
 592 -    add-int/lit8 v3, v30, 0x1
 593 +    add-int/lit8 v3, v31, 0x1
 594
 595 -    move-object/from16 v0, v29
 596 +    move-object/from16 v0, v30
 597
 598      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
 599
 600 @@ -2931,17 +3043,17 @@
 601
 602      move-result-wide v5
 603
 604 -    move-object/from16 v0, v29
 605 +    move-object/from16 v0, v30
 606
 607      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 608
 609 -    if-nez v30, :cond_266
 610 +    if-nez v31, :cond_266
 611
 612 -    move-object/from16 v0, v29
 613 +    move-object/from16 v0, v30
 614
 615      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 616
 617 -    move-object/from16 v0, v29
 618 +    move-object/from16 v0, v30
 619
 620      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
 621
 622 @@ -2949,7 +3061,7 @@
 623
 624      move-result-wide v5
 625
 626 -    move-object/from16 v0, v29
 627 +    move-object/from16 v0, v30
 628
 629      iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
 630
 631 @@ -2960,7 +3072,7 @@
 632
 633      if-nez v3, :cond_27d
 634
 635 -    move-object/from16 v0, v29
 636 +    move-object/from16 v0, v30
 637
 638      iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
 639
 640 @@ -2968,76 +3080,126 @@
 641
 642      iget-wide v7, v0, Lcom/android/server/am/BroadcastQueue;->mTimeoutPeriod:J
 643
 644 -    add-long v33, v5, v7
 645 +    add-long v34, v5, v7
 646
 647      move-object/from16 v0, p0
 648
 649 -    move-wide/from16 v1, v33
 650 +    move-wide/from16 v1, v34
 651
 652      invoke-virtual {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->setBroadcastTimeoutLocked(J)V
 653
 654      :cond_27d
 655 -    move-object/from16 v0, v29
 656 +    move-object/from16 v0, v30
 657
 658      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 659
 660 -    move/from16 v0, v30
 661 +    move/from16 v0, v31
 662
 663      invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 664
 665 -    move-result-object v24
 666 +    move-result-object v25
 667 +
 668 +    move-object/from16 v0, p0
 669 +
 670 +    move-object/from16 v1, v25
 671 +
 672 +    move-object/from16 v2, v30
 673 +
 674 +    invoke-direct {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
 675 +
 676 +    const/16 v16, 0x0
 677 +
 678 +    if-eqz v30, :cond_2b6
 679 +
 680 +    move-object/from16 v0, v30
 681 +
 682 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 683 +
 684 +    if-eqz v3, :cond_2b6
 685 +
 686 +    move-object/from16 v0, v30
 687 +
 688 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 689 +
 690 +    invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 691 +
 692 +    move-result-object v3
 693 +
 694 +    if-eqz v3, :cond_2b6
 695 +
 696 +    move-object/from16 v0, v30
 697 +
 698 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 699 +
 700 +    invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 701 +
 702 +    move-result-object v3
 703 +
 704 +    const-string v5, "catchBootComplete"
 705 +
 706 +    invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 707 +
 708 +    move-result v3
 709 +
 710 +    if-eqz v3, :cond_2b6
 711
 712 -    move-object/from16 v0, v24
 713 +    const/16 v16, 0x1
 714 +
 715 +    :cond_2b6
 716 +    move-object/from16 v0, v25
 717
 718      instance-of v3, v0, Lcom/android/server/am/BroadcastFilter;
 719
 720 -    if-eqz v3, :cond_2e4
 721 +    if-eqz v3, :cond_329
 722
 723 -    move-object/from16 v0, v24
 724 +    move-object/from16 v0, v25
 725
 726      check-cast v0, Lcom/android/server/am/BroadcastFilter;
 727
 728 -    move-object/from16 v16, v0
 729 +    move-object/from16 v17, v0
 730 +
 731 +    if-nez v16, :cond_315
 732
 733 -    move-object/from16 v0, v29
 734 +    move-object/from16 v0, v30
 735
 736      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 737
 738      move-object/from16 v0, p0
 739
 740 -    move-object/from16 v1, v29
 741 +    move-object/from16 v1, v30
 742
 743 -    move-object/from16 v2, v16
 744 +    move-object/from16 v2, v17
 745
 746      invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
 747
 748 -    move-object/from16 v0, v29
 749 +    :goto_2d1
 750 +    move-object/from16 v0, v30
 751
 752      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 753
 754 -    if-eqz v3, :cond_2ac
 755 +    if-eqz v3, :cond_2dd
 756
 757 -    move-object/from16 v0, v29
 758 +    move-object/from16 v0, v30
 759
 760      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 761
 762 -    if-nez v3, :cond_2b4
 763 +    if-nez v3, :cond_2e5
 764
 765 -    :cond_2ac
 766 +    :cond_2dd
 767      const/4 v3, 0x0
 768
 769 -    move-object/from16 v0, v29
 770 +    move-object/from16 v0, v30
 771
 772      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
 773
 774      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
 775
 776 -    :cond_2b4
 777 -    monitor-exit v35
 778 +    :cond_2e5
 779 +    monitor-exit v36
 780
 781      goto/16 :goto_93
 782
 783 -    :catch_2b7
 784 +    :catch_2e8
 785      move-exception v15
 786
 787      const-string v3, "BroadcastQueue"
 788 @@ -3066,7 +3228,7 @@
 789
 790      move-result-object v5
 791
 792 -    move-object/from16 v0, v29
 793 +    move-object/from16 v0, v30
 794
 795      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 796
 797 @@ -3082,16 +3244,39 @@
 798
 799      goto/16 :goto_228
 800
 801 -    :cond_2e4
 802 -    move-object/from16 v0, v24
 803 +    :cond_315
 804 +    const/4 v3, 0x0
 805 +
 806 +    move-object/from16 v0, v30
 807 +
 808 +    iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 809 +
 810 +    const/4 v3, 0x0
 811 +
 812 +    move-object/from16 v0, v30
 813 +
 814 +    iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
 815 +
 816 +    move-object/from16 v0, v30
 817 +
 818 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 819 +
 820 +    const-string v5, "android.intent.action.BOOT_COMPLETED"
 821 +
 822 +    invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
 823 +
 824 +    goto :goto_2d1
 825 +
 826 +    :cond_329
 827 +    move-object/from16 v0, v25
 828
 829      check-cast v0, Landroid/content/pm/ResolveInfo;
 830
 831 -    move-object/from16 v19, v0
 832 +    move-object/from16 v20, v0
 833
 834      new-instance v14, Landroid/content/ComponentName;
 835
 836 -    move-object/from16 v0, v19
 837 +    move-object/from16 v0, v20
 838
 839      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 840
 841 @@ -3099,7 +3284,7 @@
 842
 843      iget-object v3, v3, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 844
 845 -    move-object/from16 v0, v19
 846 +    move-object/from16 v0, v20
 847
 848      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 849
 850 @@ -3107,27 +3292,27 @@
 851
 852      invoke-direct {v14, v3, v5}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 853
 854 -    const/16 v31, 0x0
 855 +    const/16 v32, 0x0
 856
 857      move-object/from16 v0, p0
 858
 859      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 860
 861 -    move-object/from16 v0, v19
 862 +    move-object/from16 v0, v20
 863
 864      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 865
 866      iget-object v4, v5, Landroid/content/pm/ActivityInfo;->permission:Ljava/lang/String;
 867
 868 -    move-object/from16 v0, v29
 869 +    move-object/from16 v0, v30
 870
 871      iget v5, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 872
 873 -    move-object/from16 v0, v29
 874 +    move-object/from16 v0, v30
 875
 876      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 877
 878 -    move-object/from16 v0, v19
 879 +    move-object/from16 v0, v20
 880
 881      iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 882
 883 @@ -3135,7 +3320,7 @@
 884
 885      iget v7, v7, Landroid/content/pm/ApplicationInfo;->uid:I
 886
 887 -    move-object/from16 v0, v19
 888 +    move-object/from16 v0, v20
 889
 890      iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 891
 892 @@ -3143,17 +3328,17 @@
 893
 894      invoke-virtual/range {v3 .. v8}, Lcom/android/server/am/ActivityManagerService;->checkComponentPermission(Ljava/lang/String;IIIZ)I
 895
 896 -    move-result v28
 897 +    move-result v29
 898
 899 -    if-eqz v28, :cond_39f
 900 +    if-eqz v29, :cond_3e4
 901
 902 -    move-object/from16 v0, v19
 903 +    move-object/from16 v0, v20
 904
 905      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 906
 907      iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
 908
 909 -    if-nez v3, :cond_4d8
 910 +    if-nez v3, :cond_52a
 911
 912      const-string v3, "BroadcastQueue"
 913
 914 @@ -3167,7 +3352,7 @@
 915
 916      move-result-object v5
 917
 918 -    move-object/from16 v0, v29
 919 +    move-object/from16 v0, v30
 920
 921      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 922
 923 @@ -3185,7 +3370,7 @@
 924
 925      move-result-object v5
 926
 927 -    move-object/from16 v0, v29
 928 +    move-object/from16 v0, v30
 929
 930      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
 931
 932 @@ -3199,7 +3384,7 @@
 933
 934      move-result-object v5
 935
 936 -    move-object/from16 v0, v29
 937 +    move-object/from16 v0, v30
 938
 939      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
 940
 941 @@ -3213,7 +3398,7 @@
 942
 943      move-result-object v5
 944
 945 -    move-object/from16 v0, v29
 946 +    move-object/from16 v0, v30
 947
 948      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 949
 950 @@ -3233,7 +3418,7 @@
 951
 952      move-result-object v5
 953
 954 -    move-object/from16 v0, v19
 955 +    move-object/from16 v0, v20
 956
 957      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 958
 959 @@ -3265,11 +3450,11 @@
 960
 961      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 962
 963 -    :goto_39d
 964 -    const/16 v31, 0x1
 965 +    :goto_3e2
 966 +    const/16 v32, 0x1
 967
 968 -    :cond_39f
 969 -    move-object/from16 v0, v19
 970 +    :cond_3e4
 971 +    move-object/from16 v0, v20
 972
 973      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 974
 975 @@ -3279,26 +3464,26 @@
 976
 977      const/16 v5, 0x3e8
 978
 979 -    if-eq v3, v5, :cond_423
 980 +    if-eq v3, v5, :cond_468
 981
 982 -    move-object/from16 v0, v29
 983 +    move-object/from16 v0, v30
 984
 985      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 986 -    :try_end_3af
 987 -    .catchall {:try_start_228 .. :try_end_3af} :catchall_69
 988 +    :try_end_3f4
 989 +    .catchall {:try_start_228 .. :try_end_3f4} :catchall_69
 990
 991 -    if-eqz v3, :cond_423
 992 +    if-eqz v3, :cond_468
 993
 994 -    :try_start_3b1
 995 +    :try_start_3f6
 996      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 997
 998      move-result-object v3
 999
1000 -    move-object/from16 v0, v29
1001 +    move-object/from16 v0, v30
1002
1003      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1004
1005 -    move-object/from16 v0, v19
1006 +    move-object/from16 v0, v20
1007
1008      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1009
1010 @@ -3307,16 +3492,16 @@
1011      iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1012
1013      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
1014 -    :try_end_3c4
1015 -    .catchall {:try_start_3b1 .. :try_end_3c4} :catchall_69
1016 -    .catch Landroid/os/RemoteException; {:try_start_3b1 .. :try_end_3c4} :catch_548
1017 +    :try_end_409
1018 +    .catchall {:try_start_3f6 .. :try_end_409} :catchall_69
1019 +    .catch Landroid/os/RemoteException; {:try_start_3f6 .. :try_end_409} :catch_59a
1020
1021 -    move-result v28
1022 +    move-result v29
1023
1024 -    :goto_3c5
1025 -    if-eqz v28, :cond_423
1026 +    :goto_40a
1027 +    if-eqz v29, :cond_468
1028
1029 -    :try_start_3c7
1030 +    :try_start_40c
1031      const-string v3, "BroadcastQueue"
1032
1033      new-instance v5, Ljava/lang/StringBuilder;
1034 @@ -3329,7 +3514,7 @@
1035
1036      move-result-object v5
1037
1038 -    move-object/from16 v0, v29
1039 +    move-object/from16 v0, v30
1040
1041      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1042
1043 @@ -3357,7 +3542,7 @@
1044
1045      move-result-object v5
1046
1047 -    move-object/from16 v0, v29
1048 +    move-object/from16 v0, v30
1049
1050      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1051
1052 @@ -3371,7 +3556,7 @@
1053
1054      move-result-object v5
1055
1056 -    move-object/from16 v0, v29
1057 +    move-object/from16 v0, v30
1058
1059      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1060
1061 @@ -3385,7 +3570,7 @@
1062
1063      move-result-object v5
1064
1065 -    move-object/from16 v0, v29
1066 +    move-object/from16 v0, v30
1067
1068      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1069
1070 @@ -3405,16 +3590,16 @@
1071
1072      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1073
1074 -    const/16 v31, 0x1
1075 +    const/16 v32, 0x1
1076
1077 -    :cond_423
1078 -    move-object/from16 v0, v29
1079 +    :cond_468
1080 +    move-object/from16 v0, v30
1081
1082      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->appOp:I
1083
1084      const/4 v5, -0x1
1085
1086 -    if-eq v3, v5, :cond_44a
1087 +    if-eq v3, v5, :cond_48f
1088
1089      move-object/from16 v0, p0
1090
1091 @@ -3422,11 +3607,11 @@
1092
1093      iget-object v3, v3, Lcom/android/server/am/ActivityManagerService;->mAppOpsService:Lcom/android/server/AppOpsService;
1094
1095 -    move-object/from16 v0, v29
1096 +    move-object/from16 v0, v30
1097
1098      iget v5, v0, Lcom/android/server/am/BroadcastRecord;->appOp:I
1099
1100 -    move-object/from16 v0, v19
1101 +    move-object/from16 v0, v20
1102
1103      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1104
1105 @@ -3434,64 +3619,64 @@
1106
1107      iget v6, v6, Landroid/content/pm/ApplicationInfo;->uid:I
1108
1109 -    move-object/from16 v0, v19
1110 +    move-object/from16 v0, v20
1111
1112      iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1113
1114      iget-object v7, v7, Landroid/content/pm/ActivityInfo;->packageName:Ljava/lang/String;
1115
1116      invoke-virtual {v3, v5, v6, v7}, Lcom/android/server/AppOpsService;->checkOperation(IILjava/lang/String;)I
1117 -    :try_end_445
1118 -    .catchall {:try_start_3c7 .. :try_end_445} :catchall_69
1119 +    :try_end_48a
1120 +    .catchall {:try_start_40c .. :try_end_48a} :catchall_69
1121
1122 -    move-result v23
1123 +    move-result v24
1124
1125 -    if-eqz v23, :cond_44a
1126 +    if-eqz v24, :cond_48f
1127
1128 -    const/16 v31, 0x1
1129 +    const/16 v32, 0x1
1130
1131 -    :cond_44a
1132 -    const/16 v21, 0x0
1133 +    :cond_48f
1134 +    const/16 v22, 0x0
1135
1136 -    :try_start_44c
1137 +    :try_start_491
1138      move-object/from16 v0, p0
1139
1140      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1141
1142 -    move-object/from16 v0, v19
1143 +    move-object/from16 v0, v20
1144
1145      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1146
1147      iget-object v5, v5, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1148
1149 -    move-object/from16 v0, v19
1150 +    move-object/from16 v0, v20
1151
1152      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1153
1154      iget-object v6, v6, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
1155
1156 -    move-object/from16 v0, v19
1157 +    move-object/from16 v0, v20
1158
1159      iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1160
1161      iget-object v7, v7, Landroid/content/pm/ActivityInfo;->name:Ljava/lang/String;
1162
1163 -    move-object/from16 v0, v19
1164 +    move-object/from16 v0, v20
1165
1166      iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1167
1168      iget v8, v8, Landroid/content/pm/ActivityInfo;->flags:I
1169
1170      invoke-virtual {v3, v5, v6, v7, v8}, Lcom/android/server/am/ActivityManagerService;->isSingleton(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;Ljava/lang/String;I)Z
1171 -    :try_end_46b
1172 -    .catchall {:try_start_44c .. :try_end_46b} :catchall_69
1173 -    .catch Ljava/lang/SecurityException; {:try_start_44c .. :try_end_46b} :catch_54d
1174 -
1175 -    move-result v21
1176 -
1177 -    :goto_46c
1178 -    :try_start_46c
1179 -    move-object/from16 v0, v19
1180 +    :try_end_4b0
1181 +    .catchall {:try_start_491 .. :try_end_4b0} :catchall_69
1182 +    .catch Ljava/lang/SecurityException; {:try_start_491 .. :try_end_4b0} :catch_59f
1183 +
1184 +    move-result v22
1185 +
1186 +    :goto_4b1
1187 +    :try_start_4b1
1188 +    move-object/from16 v0, v20
1189
1190      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1191
1192 @@ -3501,11 +3686,11 @@
1193
1194      and-int/2addr v3, v5
1195
1196 -    if-eqz v3, :cond_4b1
1197 +    if-eqz v3, :cond_4f6
1198
1199      const-string v3, "android.permission.INTERACT_ACROSS_USERS"
1200
1201 -    move-object/from16 v0, v19
1202 +    move-object/from16 v0, v20
1203
1204      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1205
1206 @@ -3517,7 +3702,7 @@
1207
1208      move-result v3
1209
1210 -    if-eqz v3, :cond_4b1
1211 +    if-eqz v3, :cond_4f6
1212
1213      const-string v3, "BroadcastQueue"
1214
1215 @@ -3557,53 +3742,66 @@
1216
1217      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1218
1219 -    const/16 v31, 0x1
1220 +    const/16 v32, 0x1
1221
1222 -    :cond_4b1
1223 -    move-object/from16 v0, v29
1224 +    :cond_4f6
1225 +    move-object/from16 v0, v30
1226
1227      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1228
1229 -    if-eqz v3, :cond_4c1
1230 +    if-eqz v3, :cond_506
1231
1232 -    move-object/from16 v0, v29
1233 +    move-object/from16 v0, v30
1234
1235      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1236
1237      iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
1238
1239 -    if-eqz v3, :cond_4c1
1240 +    if-eqz v3, :cond_506
1241 +
1242 +    const/16 v32, 0x1
1243 +
1244 +    :cond_506
1245 +    if-eqz v16, :cond_513
1246 +
1247 +    const/16 v32, 0x1
1248 +
1249 +    move-object/from16 v0, v30
1250 +
1251 +    iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1252 +
1253 +    const-string v5, "android.intent.action.BOOT_COMPLETED"
1254
1255 -    const/16 v31, 0x1
1256 +    invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
1257
1258 -    :cond_4c1
1259 -    if-eqz v31, :cond_55b
1260 +    :cond_513
1261 +    if-eqz v32, :cond_5ad
1262
1263      const/4 v3, 0x0
1264
1265 -    move-object/from16 v0, v29
1266 +    move-object/from16 v0, v30
1267
1268      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
1269
1270      const/4 v3, 0x0
1271
1272 -    move-object/from16 v0, v29
1273 +    move-object/from16 v0, v30
1274
1275      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
1276
1277      const/4 v3, 0x0
1278
1279 -    move-object/from16 v0, v29
1280 +    move-object/from16 v0, v30
1281
1282      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1283
1284      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
1285
1286 -    monitor-exit v35
1287 +    monitor-exit v36
1288
1289      goto/16 :goto_93
1290
1291 -    :cond_4d8
1292 +    :cond_52a
1293      const-string v3, "BroadcastQueue"
1294
1295      new-instance v5, Ljava/lang/StringBuilder;
1296 @@ -3616,7 +3814,7 @@
1297
1298      move-result-object v5
1299
1300 -    move-object/from16 v0, v29
1301 +    move-object/from16 v0, v30
1302
1303      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1304
1305 @@ -3634,7 +3832,7 @@
1306
1307      move-result-object v5
1308
1309 -    move-object/from16 v0, v29
1310 +    move-object/from16 v0, v30
1311
1312      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1313
1314 @@ -3648,7 +3846,7 @@
1315
1316      move-result-object v5
1317
1318 -    move-object/from16 v0, v29
1319 +    move-object/from16 v0, v30
1320
1321      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
1322
1323 @@ -3662,7 +3860,7 @@
1324
1325      move-result-object v5
1326
1327 -    move-object/from16 v0, v29
1328 +    move-object/from16 v0, v30
1329
1330      iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1331
1332 @@ -3682,7 +3880,7 @@
1333
1334      move-result-object v5
1335
1336 -    move-object/from16 v0, v19
1337 +    move-object/from16 v0, v20
1338
1339      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1340
1341 @@ -3712,16 +3910,16 @@
1342
1343      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1344
1345 -    goto/16 :goto_39d
1346 +    goto/16 :goto_3e2
1347
1348 -    :catch_548
1349 +    :catch_59a
1350      move-exception v15
1351
1352 -    const/16 v28, -0x1
1353 +    const/16 v29, -0x1
1354
1355 -    goto/16 :goto_3c5
1356 +    goto/16 :goto_40a
1357
1358 -    :catch_54d
1359 +    :catch_59f
1360      move-exception v15
1361
1362      const-string v3, "BroadcastQueue"
1363 @@ -3732,42 +3930,42 @@
1364
1365      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1366
1367 -    const/16 v31, 0x1
1368 +    const/16 v32, 0x1
1369
1370 -    goto/16 :goto_46c
1371 +    goto/16 :goto_4b1
1372
1373 -    :cond_55b
1374 +    :cond_5ad
1375      const/4 v3, 0x1
1376
1377 -    move-object/from16 v0, v29
1378 +    move-object/from16 v0, v30
1379
1380      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1381
1382 -    move-object/from16 v0, v19
1383 +    move-object/from16 v0, v20
1384
1385      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1386
1387      iget-object v4, v3, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1388
1389 -    move-object/from16 v0, v29
1390 +    move-object/from16 v0, v30
1391
1392      iput-object v14, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1393
1394 -    move-object/from16 v0, v29
1395 +    move-object/from16 v0, v30
1396
1397      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1398
1399      const/16 v5, 0x3e8
1400
1401 -    if-eq v3, v5, :cond_585
1402 +    if-eq v3, v5, :cond_5d7
1403
1404 -    if-eqz v21, :cond_585
1405 +    if-eqz v22, :cond_5d7
1406
1407      move-object/from16 v0, p0
1408
1409      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1410
1411 -    move-object/from16 v0, v19
1412 +    move-object/from16 v0, v20
1413
1414      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1415
1416 @@ -3777,27 +3975,27 @@
1417
1418      move-result-object v3
1419
1420 -    move-object/from16 v0, v19
1421 +    move-object/from16 v0, v20
1422
1423      iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1424
1425 -    :cond_585
1426 -    move-object/from16 v0, v19
1427 +    :cond_5d7
1428 +    move-object/from16 v0, v20
1429
1430      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1431
1432 -    move-object/from16 v0, v29
1433 +    move-object/from16 v0, v30
1434
1435      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
1436 -    :try_end_58d
1437 -    .catchall {:try_start_46c .. :try_end_58d} :catchall_69
1438 +    :try_end_5df
1439 +    .catchall {:try_start_4b1 .. :try_end_5df} :catchall_69
1440
1441 -    :try_start_58d
1442 +    :try_start_5df
1443      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
1444
1445      move-result-object v3
1446
1447 -    move-object/from16 v0, v29
1448 +    move-object/from16 v0, v30
1449
1450      iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1451
1452 @@ -3807,7 +4005,7 @@
1453
1454      const/4 v6, 0x0
1455
1456 -    move-object/from16 v0, v29
1457 +    move-object/from16 v0, v30
1458
1459      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1460
1461 @@ -3816,18 +4014,18 @@
1462      move-result v7
1463
1464      invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
1465 -    :try_end_5a5
1466 -    .catchall {:try_start_58d .. :try_end_5a5} :catchall_69
1467 -    .catch Landroid/os/RemoteException; {:try_start_58d .. :try_end_5a5} :catch_722
1468 -    .catch Ljava/lang/IllegalArgumentException; {:try_start_58d .. :try_end_5a5} :catch_5ce
1469 +    :try_end_5f7
1470 +    .catchall {:try_start_5df .. :try_end_5f7} :catchall_69
1471 +    .catch Landroid/os/RemoteException; {:try_start_5df .. :try_end_5f7} :catch_774
1472 +    .catch Ljava/lang/IllegalArgumentException; {:try_start_5df .. :try_end_5f7} :catch_620
1473
1474 -    :goto_5a5
1475 -    :try_start_5a5
1476 +    :goto_5f7
1477 +    :try_start_5f7
1478      move-object/from16 v0, p0
1479
1480      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1481
1482 -    move-object/from16 v0, v19
1483 +    move-object/from16 v0, v20
1484
1485      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1486
1487 @@ -3839,16 +4037,16 @@
1488
1489      move-result-object v13
1490
1491 -    if-eqz v13, :cond_617
1492 +    if-eqz v13, :cond_669
1493
1494      iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
1495 -    :try_end_5b9
1496 -    .catchall {:try_start_5a5 .. :try_end_5b9} :catchall_69
1497 +    :try_end_60b
1498 +    .catchall {:try_start_5f7 .. :try_end_60b} :catchall_69
1499
1500 -    if-eqz v3, :cond_617
1501 +    if-eqz v3, :cond_669
1502
1503 -    :try_start_5bb
1504 -    move-object/from16 v0, v19
1505 +    :try_start_60d
1506 +    move-object/from16 v0, v20
1507
1508      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1509
1510 @@ -3858,20 +4056,20 @@
1511
1512      move-object/from16 v0, p0
1513
1514 -    move-object/from16 v1, v29
1515 +    move-object/from16 v1, v30
1516
1517      invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
1518 -    :try_end_5cb
1519 -    .catchall {:try_start_5bb .. :try_end_5cb} :catchall_69
1520 -    .catch Landroid/os/RemoteException; {:try_start_5bb .. :try_end_5cb} :catch_5fa
1521 -    .catch Ljava/lang/RuntimeException; {:try_start_5bb .. :try_end_5cb} :catch_6bb
1522 +    :try_end_61d
1523 +    .catchall {:try_start_60d .. :try_end_61d} :catchall_69
1524 +    .catch Landroid/os/RemoteException; {:try_start_60d .. :try_end_61d} :catch_64c
1525 +    .catch Ljava/lang/RuntimeException; {:try_start_60d .. :try_end_61d} :catch_70d
1526
1527 -    :try_start_5cb
1528 -    monitor-exit v35
1529 +    :try_start_61d
1530 +    monitor-exit v36
1531
1532      goto/16 :goto_93
1533
1534 -    :catch_5ce
1535 +    :catch_620
1536      move-exception v15
1537
1538      const-string v3, "BroadcastQueue"
1539 @@ -3886,7 +4084,7 @@
1540
1541      move-result-object v5
1542
1543 -    move-object/from16 v0, v29
1544 +    move-object/from16 v0, v30
1545
1546      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1547
1548 @@ -3914,9 +4112,9 @@
1549
1550      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1551
1552 -    goto :goto_5a5
1553 +    goto :goto_5f7
1554
1555 -    :catch_5fa
1556 +    :catch_64c
1557      move-exception v15
1558
1559      const-string v3, "BroadcastQueue"
1560 @@ -3931,7 +4129,7 @@
1561
1562      move-result-object v5
1563
1564 -    move-object/from16 v0, v29
1565 +    move-object/from16 v0, v30
1566
1567      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1568
1569 @@ -3945,12 +4143,12 @@
1570
1571      invoke-static {v3, v5, v15}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1572
1573 -    :cond_617
1574 +    :cond_669
1575      move-object/from16 v0, p0
1576
1577      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1578
1579 -    move-object/from16 v0, v19
1580 +    move-object/from16 v0, v20
1581
1582      iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1583
1584 @@ -3958,7 +4156,7 @@
1585
1586      const/4 v6, 0x1
1587
1588 -    move-object/from16 v0, v29
1589 +    move-object/from16 v0, v30
1590
1591      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1592
1593 @@ -3970,11 +4168,11 @@
1594
1595      const-string v8, "broadcast"
1596
1597 -    move-object/from16 v0, v29
1598 +    move-object/from16 v0, v30
1599
1600      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1601
1602 -    move-object/from16 v0, v29
1603 +    move-object/from16 v0, v30
1604
1605      iget-object v10, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1606
1607 @@ -3986,22 +4184,22 @@
1608
1609      and-int/2addr v10, v11
1610
1611 -    if-eqz v10, :cond_710
1612 +    if-eqz v10, :cond_762
1613
1614      const/4 v10, 0x1
1615
1616 -    :goto_640
1617 +    :goto_692
1618      const/4 v11, 0x0
1619
1620      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;
1621
1622      move-result-object v3
1623
1624 -    move-object/from16 v0, v29
1625 +    move-object/from16 v0, v30
1626
1627      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1628
1629 -    if-nez v3, :cond_713
1630 +    if-nez v3, :cond_765
1631
1632      const-string v3, "BroadcastQueue"
1633
1634 @@ -4015,7 +4213,7 @@
1635
1636      move-result-object v5
1637
1638 -    move-object/from16 v0, v19
1639 +    move-object/from16 v0, v20
1640
1641      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1642
1643 @@ -4033,7 +4231,7 @@
1644
1645      move-result-object v5
1646
1647 -    move-object/from16 v0, v19
1648 +    move-object/from16 v0, v20
1649
1650      iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1651
1652 @@ -4051,7 +4249,7 @@
1653
1654      move-result-object v5
1655
1656 -    move-object/from16 v0, v29
1657 +    move-object/from16 v0, v30
1658
1659      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1660
1661 @@ -4073,23 +4271,23 @@
1662
1663      move-object/from16 v0, p0
1664
1665 -    move-object/from16 v1, v29
1666 +    move-object/from16 v1, v30
1667
1668      invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1669
1670 -    move-object/from16 v0, v29
1671 +    move-object/from16 v0, v30
1672
1673      iget v7, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1674
1675 -    move-object/from16 v0, v29
1676 +    move-object/from16 v0, v30
1677
1678      iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1679
1680 -    move-object/from16 v0, v29
1681 +    move-object/from16 v0, v30
1682
1683      iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1684
1685 -    move-object/from16 v0, v29
1686 +    move-object/from16 v0, v30
1687
1688      iget-boolean v10, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1689
1690 @@ -4097,7 +4295,7 @@
1691
1692      move-object/from16 v5, p0
1693
1694 -    move-object/from16 v6, v29
1695 +    move-object/from16 v6, v30
1696
1697      invoke-virtual/range {v5 .. v11}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1698
1699 @@ -4105,15 +4303,15 @@
1700
1701      const/4 v3, 0x0
1702
1703 -    move-object/from16 v0, v29
1704 +    move-object/from16 v0, v30
1705
1706      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1707
1708 -    monitor-exit v35
1709 +    monitor-exit v36
1710
1711      goto/16 :goto_93
1712
1713 -    :catch_6bb
1714 +    :catch_70d
1715      move-exception v15
1716
1717      const-string v3, "BroadcastQueue"
1718 @@ -4128,7 +4326,7 @@
1719
1720      move-result-object v5
1721
1722 -    move-object/from16 v0, v29
1723 +    move-object/from16 v0, v30
1724
1725      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1726
1727 @@ -4142,7 +4340,7 @@
1728
1729      move-result-object v5
1730
1731 -    move-object/from16 v0, v29
1732 +    move-object/from16 v0, v30
1733
1734      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1735
1736 @@ -4158,23 +4356,23 @@
1737
1738      move-object/from16 v0, p0
1739
1740 -    move-object/from16 v1, v29
1741 +    move-object/from16 v1, v30
1742
1743      invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1744
1745 -    move-object/from16 v0, v29
1746 +    move-object/from16 v0, v30
1747
1748      iget v5, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1749
1750 -    move-object/from16 v0, v29
1751 +    move-object/from16 v0, v30
1752
1753      iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1754
1755 -    move-object/from16 v0, v29
1756 +    move-object/from16 v0, v30
1757
1758      iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1759
1760 -    move-object/from16 v0, v29
1761 +    move-object/from16 v0, v30
1762
1763      iget-boolean v8, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1764
1765 @@ -4182,7 +4380,7 @@
1766
1767      move-object/from16 v3, p0
1768
1769 -    move-object/from16 v4, v29
1770 +    move-object/from16 v4, v30
1771
1772      invoke-virtual/range {v3 .. v9}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1773
1774 @@ -4190,42 +4388,42 @@
1775
1776      const/4 v3, 0x0
1777
1778 -    move-object/from16 v0, v29
1779 +    move-object/from16 v0, v30
1780
1781      iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1782
1783 -    monitor-exit v35
1784 +    monitor-exit v36
1785
1786      goto/16 :goto_93
1787
1788 -    :cond_710
1789 +    :cond_762
1790      const/4 v10, 0x0
1791
1792 -    goto/16 :goto_640
1793 +    goto/16 :goto_692
1794
1795 -    :cond_713
1796 -    move-object/from16 v0, v29
1797 +    :cond_765
1798 +    move-object/from16 v0, v30
1799
1800      move-object/from16 v1, p0
1801
1802      iput-object v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
1803
1804 -    move/from16 v0, v30
1805 +    move/from16 v0, v31
1806
1807      move-object/from16 v1, p0
1808
1809      iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
1810
1811 -    monitor-exit v35
1812 -    :try_end_720
1813 -    .catchall {:try_start_5cb .. :try_end_720} :catchall_69
1814 +    monitor-exit v36
1815 +    :try_end_772
1816 +    .catchall {:try_start_61d .. :try_end_772} :catchall_69
1817
1818      goto/16 :goto_93
1819
1820 -    :catch_722
1821 +    :catch_774
1822      move-exception v3
1823
1824 -    goto/16 :goto_5a5
1825 +    goto/16 :goto_5f7
1826  .end method
1827
1828  .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
1829 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali pdroid-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali
1830 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali    1969-12-31 16:00:00.000000000 -0800
1831 +++ pdroid-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali   2013-08-10 20:37:56.839214036 -0700
1832 @@ -0,0 +1,180 @@
1833 +.class Lcom/android/server/PrivacyTelephonyRegistry$1;
1834 +.super Landroid/content/BroadcastReceiver;
1835 +.source "PrivacyTelephonyRegistry.java"
1836 +
1837 +
1838 +# annotations
1839 +.annotation system Ldalvik/annotation/EnclosingClass;
1840 +    value = Lcom/android/server/PrivacyTelephonyRegistry;
1841 +.end annotation
1842 +
1843 +.annotation system Ldalvik/annotation/InnerClass;
1844 +    accessFlags = 0x0
1845 +    name = null
1846 +.end annotation
1847 +
1848 +
1849 +# instance fields
1850 +.field final synthetic this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1851 +
1852 +
1853 +# direct methods
1854 +.method constructor <init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1855 +    .registers 2
1856 +
1857 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1858 +
1859 +    invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
1860 +
1861 +    return-void
1862 +.end method
1863 +
1864 +
1865 +# virtual methods
1866 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
1867 +    .registers 10
1868 +
1869 +    const/4 v6, 0x0
1870 +
1871 +    invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
1872 +
1873 +    move-result-object v3
1874 +
1875 +    const-string v4, "android.privacy.BLOCKED_PHONE_CALL"
1876 +
1877 +    invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1878 +
1879 +    move-result v3
1880 +
1881 +    if-eqz v3, :cond_44
1882 +
1883 +    new-instance v0, Landroid/os/Bundle;
1884 +
1885 +    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
1886 +
1887 +    invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
1888 +
1889 +    move-result-object v0
1890 +
1891 +    const-string v3, "packageName"
1892 +
1893 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1894 +
1895 +    move-result-object v1
1896 +
1897 +    const-string v3, "packageName"
1898 +
1899 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1900 +
1901 +    move-result v3
1902 +
1903 +    if-eqz v3, :cond_45
1904 +
1905 +    const-string v3, "PrivacyTelephonyRegistry"
1906 +
1907 +    new-instance v4, Ljava/lang/StringBuilder;
1908 +
1909 +    invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
1910 +
1911 +    const-string v5, "got blocked phone call INTENT from package: "
1912 +
1913 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1914 +
1915 +    move-result-object v4
1916 +
1917 +    const-string v5, "packageName"
1918 +
1919 +    invoke-virtual {v0, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1920 +
1921 +    move-result-object v5
1922 +
1923 +    invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1924 +
1925 +    move-result-object v4
1926 +
1927 +    invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1928 +
1929 +    move-result-object v4
1930 +
1931 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1932 +
1933 +    :goto_42
1934 +    if-nez v1, :cond_4d
1935 +
1936 +    :cond_44
1937 +    :goto_44
1938 +    return-void
1939 +
1940 +    :cond_45
1941 +    const-string v3, "PrivacyTelephonyRegistry"
1942 +
1943 +    const-string v4, "got blocked phone call INTENT without package information"
1944 +
1945 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1946 +
1947 +    goto :goto_42
1948 +
1949 +    :cond_4d
1950 +    const-string v3, "phoneState"
1951 +
1952 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1953 +
1954 +    move-result v3
1955 +
1956 +    if-eqz v3, :cond_76
1957 +
1958 +    const-string v3, "phoneState"
1959 +
1960 +    invoke-virtual {v0, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
1961 +
1962 +    move-result v2
1963 +
1964 +    packed-switch v2, :pswitch_data_7e
1965 +
1966 +    goto :goto_44
1967 +
1968 +    :pswitch_5f
1969 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1970 +
1971 +    const/4 v4, 0x0
1972 +
1973 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1974 +
1975 +    goto :goto_44
1976 +
1977 +    :pswitch_66
1978 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1979 +
1980 +    const/4 v4, 0x2
1981 +
1982 +    invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1983 +
1984 +    goto :goto_44
1985 +
1986 +    :pswitch_6d
1987 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1988 +
1989 +    const/4 v4, 0x1
1990 +
1991 +    const-string v5, "12345"
1992 +
1993 +    invoke-virtual {v3, v4, v5, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1994 +
1995 +    goto :goto_44
1996 +
1997 +    :cond_76
1998 +    const-string v3, "PrivacyTelephonyRegistry"
1999 +
2000 +    const-string v4, "we forgot to put phoneState in Intent?"
2001 +
2002 +    invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2003 +
2004 +    goto :goto_44
2005 +
2006 +    :pswitch_data_7e
2007 +    .packed-switch 0x0
2008 +        :pswitch_5f
2009 +        :pswitch_6d
2010 +        :pswitch_66
2011 +    .end packed-switch
2012 +.end method
2013 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali pdroid-services/smali/com/android/server/PrivacyTelephonyRegistry.smali
2014 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali      1969-12-31 16:00:00.000000000 -0800
2015 +++ pdroid-services/smali/com/android/server/PrivacyTelephonyRegistry.smali     2013-08-10 20:37:56.851214037 -0700
2016 @@ -0,0 +1,1393 @@
2017 +.class public Lcom/android/server/PrivacyTelephonyRegistry;
2018 +.super Lcom/android/server/TelephonyRegistry;
2019 +.source "PrivacyTelephonyRegistry.java"
2020 +
2021 +
2022 +# static fields
2023 +.field private static final PERMISSION_CALL_STATE:I = 0x3
2024 +
2025 +.field private static final PERMISSION_CELL_INFO:I = 0x1
2026 +
2027 +.field private static final PERMISSION_CELL_LOCATION:I = 0x0
2028 +
2029 +.field private static final PERMISSION_SERVICE_STATE:I = 0x4
2030 +
2031 +.field private static final PERMISSION_SIGNAL_STRENGTH:I = 0x2
2032 +
2033 +.field private static final P_TAG:Ljava/lang/String; = "PrivacyTelephonyRegistry"
2034 +
2035 +
2036 +# instance fields
2037 +.field private pSetMan:Landroid/privacy/PrivacySettingsManager;
2038 +
2039 +.field private final privacyReceiver:Landroid/content/BroadcastReceiver;
2040 +
2041 +
2042 +# direct methods
2043 +.method public constructor <init>(Landroid/content/Context;)V
2044 +    .registers 5
2045 +
2046 +    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
2047 +
2048 +    new-instance v1, Lcom/android/server/PrivacyTelephonyRegistry$1;
2049 +
2050 +    invoke-direct {v1, p0}, Lcom/android/server/PrivacyTelephonyRegistry$1;-><init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
2051 +
2052 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2053 +
2054 +    new-instance v1, Landroid/privacy/PrivacySettingsManager;
2055 +
2056 +    const-string v2, "privacy"
2057 +
2058 +    invoke-static {v2}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
2059 +
2060 +    move-result-object v2
2061 +
2062 +    invoke-static {v2}, Landroid/privacy/IPrivacySettingsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/privacy/IPrivacySettingsManager;
2063 +
2064 +    move-result-object v2
2065 +
2066 +    invoke-direct {v1, p1, v2}, Landroid/privacy/PrivacySettingsManager;-><init>(Landroid/content/Context;Landroid/privacy/IPrivacySettingsManager;)V
2067 +
2068 +    iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
2069 +
2070 +    :try_start_1b
2071 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2072 +    :try_end_1e
2073 +    .catch Ljava/lang/Exception; {:try_start_1b .. :try_end_1e} :catch_26
2074 +
2075 +    :goto_1e
2076 +    const-string v1, "PrivacyTelephonyRegistry"
2077 +
2078 +    const-string v2, "constructor ready"
2079 +
2080 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2081 +
2082 +    return-void
2083 +
2084 +    :catch_26
2085 +    move-exception v0
2086 +
2087 +    const-string v1, "PrivacyTelephonyRegistry"
2088 +
2089 +    const-string v2, "failed to register privacy broadcastreceiver"
2090 +
2091 +    invoke-static {v1, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2092 +
2093 +    goto :goto_1e
2094 +.end method
2095 +
2096 +.method private isPackageAllowed(ILjava/lang/String;)Z
2097 +    .registers 8
2098 +
2099 +    const/4 v2, 0x1
2100 +
2101 +    const/4 v1, 0x0
2102 +
2103 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
2104 +
2105 +    invoke-static {}, Landroid/os/Process;->myUid()I
2106 +
2107 +    move-result v4
2108 +
2109 +    invoke-virtual {v3, p2, v4}, Landroid/privacy/PrivacySettingsManager;->getSettings(Ljava/lang/String;I)Landroid/privacy/PrivacySettings;
2110 +
2111 +    move-result-object v0
2112 +
2113 +    if-nez v0, :cond_f
2114 +
2115 +    :cond_e
2116 +    :goto_e
2117 +    return v1
2118 +
2119 +    :cond_f
2120 +    packed-switch p1, :pswitch_data_42
2121 +
2122 +    goto :goto_e
2123 +
2124 +    :pswitch_13
2125 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2126 +
2127 +    move-result v3
2128 +
2129 +    if-nez v3, :cond_e
2130 +
2131 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationGpsSetting()B
2132 +
2133 +    move-result v3
2134 +
2135 +    if-nez v3, :cond_e
2136 +
2137 +    move v1, v2
2138 +
2139 +    goto :goto_e
2140 +
2141 +    :pswitch_21
2142 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2143 +
2144 +    move-result v3
2145 +
2146 +    if-nez v3, :cond_e
2147 +
2148 +    move v1, v2
2149 +
2150 +    goto :goto_e
2151 +
2152 +    :pswitch_29
2153 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2154 +
2155 +    move-result v3
2156 +
2157 +    if-nez v3, :cond_e
2158 +
2159 +    move v1, v2
2160 +
2161 +    goto :goto_e
2162 +
2163 +    :pswitch_31
2164 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2165 +
2166 +    move-result v3
2167 +
2168 +    if-nez v3, :cond_e
2169 +
2170 +    move v1, v2
2171 +
2172 +    goto :goto_e
2173 +
2174 +    :pswitch_39
2175 +    invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2176 +
2177 +    move-result v3
2178 +
2179 +    if-nez v3, :cond_e
2180 +
2181 +    move v1, v2
2182 +
2183 +    goto :goto_e
2184 +
2185 +    nop
2186 +
2187 +    :pswitch_data_42
2188 +    .packed-switch 0x0
2189 +        :pswitch_13
2190 +        :pswitch_21
2191 +        :pswitch_29
2192 +        :pswitch_31
2193 +        :pswitch_39
2194 +    .end packed-switch
2195 +.end method
2196 +
2197 +.method private registerPrivacy()V
2198 +    .registers 4
2199 +
2200 +    new-instance v0, Landroid/content/IntentFilter;
2201 +
2202 +    const-string v1, "android.privacy.BLOCKED_PHONE_CALL"
2203 +
2204 +    invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
2205 +
2206 +    iget-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mContext:Landroid/content/Context;
2207 +
2208 +    iget-object v2, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2209 +
2210 +    invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
2211 +
2212 +    return-void
2213 +.end method
2214 +
2215 +
2216 +# virtual methods
2217 +.method public bridge synthetic dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2218 +    .registers 4
2219 +
2220 +    invoke-super {p0, p1, p2, p3}, Lcom/android/server/TelephonyRegistry;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2221 +
2222 +    return-void
2223 +.end method
2224 +
2225 +.method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
2226 +    .registers 19
2227 +
2228 +    :try_start_0
2229 +    invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2230 +    :try_end_3
2231 +    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_3} :catch_af
2232 +
2233 +    :goto_3
2234 +    if-eqz p3, :cond_110
2235 +
2236 +    move/from16 v0, p3
2237 +
2238 +    invoke-virtual {p0, v0}, Lcom/android/server/PrivacyTelephonyRegistry;->checkListenerPermission(I)V
2239 +
2240 +    iget-object v11, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2241 +
2242 +    monitor-enter v11
2243 +
2244 +    const/4 v7, 0x0
2245 +
2246 +    :try_start_e
2247 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2248 +
2249 +    move-result-object v2
2250 +
2251 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2252 +
2253 +    invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
2254 +    :try_end_17
2255 +    .catchall {:try_start_e .. :try_end_17} :catchall_d2
2256 +
2257 +    move-result v1
2258 +
2259 +    const/4 v6, 0x0
2260 +
2261 +    move-object v8, v7
2262 +
2263 +    :goto_1a
2264 +    if-ge v6, v1, :cond_be
2265 +
2266 +    :try_start_1c
2267 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2268 +
2269 +    invoke-virtual {v10, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
2270 +
2271 +    move-result-object v7
2272 +
2273 +    check-cast v7, Lcom/android/server/TelephonyRegistry$Record;
2274 +    :try_end_24
2275 +    .catchall {:try_start_1c .. :try_end_24} :catchall_118
2276 +
2277 +    :try_start_24
2278 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2279 +
2280 +    if-ne v2, v10, :cond_b9
2281 +
2282 +    :goto_28
2283 +    iget v10, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2284 +
2285 +    xor-int v10, v10, p3
2286 +
2287 +    and-int v9, p3, v10
2288 +
2289 +    move/from16 v0, p3
2290 +
2291 +    iput v0, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2292 +    :try_end_32
2293 +    .catchall {:try_start_24 .. :try_end_32} :catchall_d2
2294 +
2295 +    if-eqz p4, :cond_ad
2296 +
2297 +    and-int/lit8 v10, p3, 0x1
2298 +
2299 +    if-eqz v10, :cond_38
2300 +
2301 +    :cond_38
2302 +    and-int/lit8 v10, p3, 0x2
2303 +
2304 +    if-eqz v10, :cond_4c
2305 +
2306 +    :try_start_3c
2307 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2308 +
2309 +    invoke-virtual {v10}, Landroid/telephony/SignalStrength;->getGsmSignalStrength()I
2310 +
2311 +    move-result v5
2312 +
2313 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2314 +
2315 +    const/16 v12, 0x63
2316 +
2317 +    if-ne v5, v12, :cond_49
2318 +
2319 +    const/4 v5, -0x1
2320 +
2321 +    :cond_49
2322 +    invoke-interface {v10, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
2323 +    :try_end_4c
2324 +    .catchall {:try_start_3c .. :try_end_4c} :catchall_d2
2325 +    .catch Landroid/os/RemoteException; {:try_start_3c .. :try_end_4c} :catch_d5
2326 +
2327 +    :cond_4c
2328 +    :goto_4c
2329 +    and-int/lit8 v10, p3, 0x4
2330 +
2331 +    if-eqz v10, :cond_57
2332 +
2333 +    :try_start_50
2334 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2335 +
2336 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mMessageWaiting:Z
2337 +
2338 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
2339 +    :try_end_57
2340 +    .catchall {:try_start_50 .. :try_end_57} :catchall_d2
2341 +    .catch Landroid/os/RemoteException; {:try_start_50 .. :try_end_57} :catch_dd
2342 +
2343 +    :cond_57
2344 +    :goto_57
2345 +    and-int/lit8 v10, p3, 0x8
2346 +
2347 +    if-eqz v10, :cond_62
2348 +
2349 +    :try_start_5b
2350 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2351 +
2352 +    iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallForwarding:Z
2353 +
2354 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
2355 +    :try_end_62
2356 +    .catchall {:try_start_5b .. :try_end_62} :catchall_d2
2357 +    .catch Landroid/os/RemoteException; {:try_start_5b .. :try_end_62} :catch_e5
2358 +
2359 +    :cond_62
2360 +    :goto_62
2361 +    and-int/lit8 v10, p3, 0x10
2362 +
2363 +    if-eqz v10, :cond_66
2364 +
2365 +    :cond_66
2366 +    and-int/lit8 v10, p3, 0x20
2367 +
2368 +    if-eqz v10, :cond_73
2369 +
2370 +    :try_start_6a
2371 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2372 +
2373 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallState:I
2374 +
2375 +    iget-object v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallIncomingNumber:Ljava/lang/String;
2376 +
2377 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
2378 +    :try_end_73
2379 +    .catchall {:try_start_6a .. :try_end_73} :catchall_d2
2380 +    .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_73} :catch_ed
2381 +
2382 +    :cond_73
2383 +    :goto_73
2384 +    and-int/lit8 v10, p3, 0x40
2385 +
2386 +    if-eqz v10, :cond_80
2387 +
2388 +    :try_start_77
2389 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2390 +
2391 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionState:I
2392 +
2393 +    iget v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionNetworkType:I
2394 +
2395 +    invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
2396 +    :try_end_80
2397 +    .catchall {:try_start_77 .. :try_end_80} :catchall_d2
2398 +    .catch Landroid/os/RemoteException; {:try_start_77 .. :try_end_80} :catch_f4
2399 +
2400 +    :cond_80
2401 +    :goto_80
2402 +    move/from16 v0, p3
2403 +
2404 +    and-int/lit16 v10, v0, 0x80
2405 +
2406 +    if-eqz v10, :cond_8d
2407 +
2408 +    :try_start_86
2409 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2410 +
2411 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataActivity:I
2412 +
2413 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
2414 +    :try_end_8d
2415 +    .catchall {:try_start_86 .. :try_end_8d} :catchall_d2
2416 +    .catch Landroid/os/RemoteException; {:try_start_86 .. :try_end_8d} :catch_fb
2417 +
2418 +    :cond_8d
2419 +    :goto_8d
2420 +    move/from16 v0, p3
2421 +
2422 +    and-int/lit16 v10, v0, 0x100
2423 +
2424 +    if-eqz v10, :cond_9a
2425 +
2426 +    :try_start_93
2427 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2428 +
2429 +    iget-object v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2430 +
2431 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
2432 +    :try_end_9a
2433 +    .catchall {:try_start_93 .. :try_end_9a} :catchall_d2
2434 +    .catch Landroid/os/RemoteException; {:try_start_93 .. :try_end_9a} :catch_102
2435 +
2436 +    :cond_9a
2437 +    :goto_9a
2438 +    move/from16 v0, p3
2439 +
2440 +    and-int/lit16 v10, v0, 0x200
2441 +
2442 +    if-eqz v10, :cond_a7
2443 +
2444 +    :try_start_a0
2445 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2446 +
2447 +    iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mOtaspMode:I
2448 +
2449 +    invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
2450 +    :try_end_a7
2451 +    .catchall {:try_start_a0 .. :try_end_a7} :catchall_d2
2452 +    .catch Landroid/os/RemoteException; {:try_start_a0 .. :try_end_a7} :catch_109
2453 +
2454 +    :cond_a7
2455 +    :goto_a7
2456 +    move/from16 v0, p3
2457 +
2458 +    and-int/lit16 v10, v0, 0x400
2459 +
2460 +    if-eqz v10, :cond_ad
2461 +
2462 +    :cond_ad
2463 +    :try_start_ad
2464 +    monitor-exit v11
2465 +    :try_end_ae
2466 +    .catchall {:try_start_ad .. :try_end_ae} :catchall_d2
2467 +
2468 +    :goto_ae
2469 +    return-void
2470 +
2471 +    :catch_af
2472 +    move-exception v3
2473 +
2474 +    const-string v10, "PrivacyTelephonyRegistry"
2475 +
2476 +    const-string v11, "failed to register privacy broadcastreceiver"
2477 +
2478 +    invoke-static {v10, v11}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2479 +
2480 +    goto/16 :goto_3
2481 +
2482 +    :cond_b9
2483 +    add-int/lit8 v6, v6, 0x1
2484 +
2485 +    move-object v8, v7
2486 +
2487 +    goto/16 :goto_1a
2488 +
2489 +    :cond_be
2490 +    :try_start_be
2491 +    new-instance v7, Lcom/android/server/TelephonyRegistry$Record;
2492 +
2493 +    invoke-direct {v7}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
2494 +    :try_end_c3
2495 +    .catchall {:try_start_be .. :try_end_c3} :catchall_118
2496 +
2497 +    :try_start_c3
2498 +    iput-object v2, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2499 +
2500 +    move-object/from16 v0, p2
2501 +
2502 +    iput-object v0, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2503 +
2504 +    iput-object p1, v7, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2505 +
2506 +    iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2507 +
2508 +    invoke-virtual {v10, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2509 +
2510 +    goto/16 :goto_28
2511 +
2512 +    :catchall_d2
2513 +    move-exception v10
2514 +
2515 +    :goto_d3
2516 +    monitor-exit v11
2517 +    :try_end_d4
2518 +    .catchall {:try_start_c3 .. :try_end_d4} :catchall_d2
2519 +
2520 +    throw v10
2521 +
2522 +    :catch_d5
2523 +    move-exception v4
2524 +
2525 +    :try_start_d6
2526 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2527 +
2528 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2529 +
2530 +    goto/16 :goto_4c
2531 +
2532 +    :catch_dd
2533 +    move-exception v4
2534 +
2535 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2536 +
2537 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2538 +
2539 +    goto/16 :goto_57
2540 +
2541 +    :catch_e5
2542 +    move-exception v4
2543 +
2544 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2545 +
2546 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2547 +
2548 +    goto/16 :goto_62
2549 +
2550 +    :catch_ed
2551 +    move-exception v4
2552 +
2553 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2554 +
2555 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2556 +
2557 +    goto :goto_73
2558 +
2559 +    :catch_f4
2560 +    move-exception v4
2561 +
2562 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2563 +
2564 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2565 +
2566 +    goto :goto_80
2567 +
2568 +    :catch_fb
2569 +    move-exception v4
2570 +
2571 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2572 +
2573 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2574 +
2575 +    goto :goto_8d
2576 +
2577 +    :catch_102
2578 +    move-exception v4
2579 +
2580 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2581 +
2582 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2583 +
2584 +    goto :goto_9a
2585 +
2586 +    :catch_109
2587 +    move-exception v4
2588 +
2589 +    iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2590 +
2591 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2592 +    :try_end_10f
2593 +    .catchall {:try_start_d6 .. :try_end_10f} :catchall_d2
2594 +
2595 +    goto :goto_a7
2596 +
2597 +    :cond_110
2598 +    invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2599 +
2600 +    move-result-object v10
2601 +
2602 +    invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2603 +
2604 +    goto :goto_ae
2605 +
2606 +    :catchall_118
2607 +    move-exception v10
2608 +
2609 +    move-object v7, v8
2610 +
2611 +    goto :goto_d3
2612 +.end method
2613 +
2614 +.method public bridge synthetic notifyCallForwardingChanged(Z)V
2615 +    .registers 2
2616 +
2617 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyCallForwardingChanged(Z)V
2618 +
2619 +    return-void
2620 +.end method
2621 +
2622 +.method public bridge synthetic notifyCallState(ILjava/lang/String;)V
2623 +    .registers 3
2624 +
2625 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
2626 +
2627 +    return-void
2628 +.end method
2629 +
2630 +.method public notifyCellInfo(Ljava/util/List;)V
2631 +    .registers 12
2632 +    .annotation system Ldalvik/annotation/Signature;
2633 +        value = {
2634 +            "(",
2635 +            "Ljava/util/List",
2636 +            "<",
2637 +            "Landroid/telephony/CellInfo;",
2638 +            ">;)V"
2639 +        }
2640 +    .end annotation
2641 +
2642 +    const-string v5, "notifyCellInfo()"
2643 +
2644 +    invoke-virtual {p0, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2645 +
2646 +    move-result v5
2647 +
2648 +    if-nez v5, :cond_9
2649 +
2650 +    :goto_8
2651 +    return-void
2652 +
2653 +    :cond_9
2654 +    iget-object v6, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2655 +
2656 +    monitor-enter v6
2657 +
2658 +    :try_start_c
2659 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellInfo:Ljava/util/List;
2660 +
2661 +    iget-object v5, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2662 +
2663 +    invoke-virtual {v5}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2664 +
2665 +    move-result-object v3
2666 +
2667 +    :cond_14
2668 +    :goto_14
2669 +    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2670 +
2671 +    move-result v5
2672 +
2673 +    if-eqz v5, :cond_ac
2674 +
2675 +    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2676 +
2677 +    move-result-object v4
2678 +
2679 +    check-cast v4, Lcom/android/server/TelephonyRegistry$Record;
2680 +
2681 +    iget v5, v4, Lcom/android/server/TelephonyRegistry$Record;->events:I
2682 +    :try_end_22
2683 +    .catchall {:try_start_c .. :try_end_22} :catchall_82
2684 +
2685 +    and-int/lit16 v5, v5, 0x400
2686 +
2687 +    if-eqz v5, :cond_14
2688 +
2689 +    const/4 v5, 0x1
2690 +
2691 +    :try_start_27
2692 +    iget-object v7, v4, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2693 +
2694 +    invoke-direct {p0, v5, v7}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2695 +
2696 +    move-result v5
2697 +
2698 +    if-nez v5, :cond_85
2699 +
2700 +    new-instance v2, Landroid/telephony/CellInfoGsm;
2701 +
2702 +    invoke-direct {v2}, Landroid/telephony/CellInfoGsm;-><init>()V
2703 +
2704 +    new-instance v1, Landroid/telephony/CellIdentityGsm;
2705 +
2706 +    const/16 v5, 0xb
2707 +
2708 +    const/16 v7, 0xb
2709 +
2710 +    const/16 v8, 0x225
2711 +
2712 +    const/16 v9, 0x20d
2713 +
2714 +    invoke-direct {v1, v5, v7, v8, v9}, Landroid/telephony/CellIdentityGsm;-><init>(IIII)V
2715 +
2716 +    invoke-virtual {v2, v1}, Landroid/telephony/CellInfoGsm;->setCellIdentity(Landroid/telephony/CellIdentityGsm;)V
2717 +
2718 +    iget-object v5, v4, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2719 +
2720 +    new-instance v7, Ljava/util/ArrayList;
2721 +
2722 +    const/4 v8, 0x1
2723 +
2724 +    new-array v8, v8, [Landroid/telephony/CellInfoGsm;
2725 +
2726 +    const/4 v9, 0x0
2727 +
2728 +    aput-object v2, v8, v9
2729 +
2730 +    invoke-static {v8}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List;
2731 +
2732 +    move-result-object v8
2733 +
2734 +    invoke-direct {v7, v8}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
2735 +
2736 +    invoke-interface {v5, v7}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Ljava/util/List;)V
2737 +
2738 +    const-string v5, "PrivacyTelephonyRegistry"
2739 +
2740 +    new-instance v7, Ljava/lang/StringBuilder;
2741 +
2742 +    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
2743 +
2744 +    const-string v8, "package: "
2745 +
2746 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2747 +
2748 +    move-result-object v7
2749 +
2750 +    iget-object v8, v4, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2751 +
2752 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2753 +
2754 +    move-result-object v7
2755 +
2756 +    const-string v8, " blocked for Cellinfo"
2757 +
2758 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2759 +
2760 +    move-result-object v7
2761 +
2762 +    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2763 +
2764 +    move-result-object v7
2765 +
2766 +    invoke-static {v5, v7}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2767 +    :try_end_78
2768 +    .catchall {:try_start_27 .. :try_end_78} :catchall_82
2769 +    .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_78} :catch_79
2770 +
2771 +    goto :goto_14
2772 +
2773 +    :catch_79
2774 +    move-exception v0
2775 +
2776 +    :try_start_7a
2777 +    iget-object v5, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2778 +
2779 +    iget-object v7, v4, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2780 +
2781 +    invoke-virtual {v5, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2782 +
2783 +    goto :goto_14
2784 +
2785 +    :catchall_82
2786 +    move-exception v5
2787 +
2788 +    monitor-exit v6
2789 +    :try_end_84
2790 +    .catchall {:try_start_7a .. :try_end_84} :catchall_82
2791 +
2792 +    throw v5
2793 +
2794 +    :cond_85
2795 +    :try_start_85
2796 +    iget-object v5, v4, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2797 +
2798 +    invoke-interface {v5, p1}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Ljava/util/List;)V
2799 +
2800 +    const-string v5, "PrivacyTelephonyRegistry"
2801 +
2802 +    new-instance v7, Ljava/lang/StringBuilder;
2803 +
2804 +    invoke-direct {v7}, Ljava/lang/StringBuilder;-><init>()V
2805 +
2806 +    const-string v8, "package: "
2807 +
2808 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2809 +
2810 +    move-result-object v7
2811 +
2812 +    iget-object v8, v4, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2813 +
2814 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2815 +
2816 +    move-result-object v7
2817 +
2818 +    const-string v8, " allowed for Cellinfo"
2819 +
2820 +    invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2821 +
2822 +    move-result-object v7
2823 +
2824 +    invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2825 +
2826 +    move-result-object v7
2827 +
2828 +    invoke-static {v5, v7}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2829 +    :try_end_aa
2830 +    .catchall {:try_start_85 .. :try_end_aa} :catchall_82
2831 +    .catch Landroid/os/RemoteException; {:try_start_85 .. :try_end_aa} :catch_79
2832 +
2833 +    goto/16 :goto_14
2834 +
2835 +    :cond_ac
2836 +    :try_start_ac
2837 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2838 +
2839 +    monitor-exit v6
2840 +    :try_end_b0
2841 +    .catchall {:try_start_ac .. :try_end_b0} :catchall_82
2842 +
2843 +    goto/16 :goto_8
2844 +.end method
2845 +
2846 +.method public notifyCellLocation(Landroid/os/Bundle;)V
2847 +    .registers 14
2848 +
2849 +    const-string v8, "notifyCellLocation()"
2850 +
2851 +    invoke-virtual {p0, v8}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2852 +
2853 +    move-result v8
2854 +
2855 +    if-nez v8, :cond_9
2856 +
2857 +    :goto_8
2858 +    return-void
2859 +
2860 +    :cond_9
2861 +    iget-object v9, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2862 +
2863 +    monitor-enter v9
2864 +
2865 +    :try_start_c
2866 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
2867 +    :try_end_e
2868 +    .catchall {:try_start_c .. :try_end_e} :catchall_7f
2869 +
2870 +    const/4 v4, 0x0
2871 +
2872 +    const/4 v2, 0x0
2873 +
2874 +    :try_start_10
2875 +    const-string v8, "lac"
2876 +
2877 +    invoke-virtual {p1, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
2878 +    :try_end_15
2879 +    .catchall {:try_start_10 .. :try_end_15} :catchall_7f
2880 +    .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_15} :catch_84
2881 +
2882 +    move-result v8
2883 +
2884 +    if-eqz v8, :cond_82
2885 +
2886 +    const/4 v4, 0x0
2887 +
2888 +    :goto_19
2889 +    :try_start_19
2890 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2891 +
2892 +    invoke-virtual {v8}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2893 +
2894 +    move-result-object v3
2895 +
2896 +    :cond_1f
2897 +    :goto_1f
2898 +    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2899 +
2900 +    move-result v8
2901 +
2902 +    if-eqz v8, :cond_bc
2903 +
2904 +    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2905 +
2906 +    move-result-object v6
2907 +
2908 +    check-cast v6, Lcom/android/server/TelephonyRegistry$Record;
2909 +
2910 +    iget v8, v6, Lcom/android/server/TelephonyRegistry$Record;->events:I
2911 +    :try_end_2d
2912 +    .catchall {:try_start_19 .. :try_end_2d} :catchall_7f
2913 +
2914 +    and-int/lit8 v8, v8, 0x10
2915 +
2916 +    if-eqz v8, :cond_1f
2917 +
2918 +    const/4 v8, 0x0
2919 +
2920 +    :try_start_32
2921 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2922 +
2923 +    invoke-direct {p0, v8, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2924 +
2925 +    move-result v8
2926 +
2927 +    if-nez v8, :cond_90
2928 +
2929 +    if-nez v2, :cond_90
2930 +
2931 +    new-instance v5, Landroid/os/Bundle;
2932 +
2933 +    invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
2934 +
2935 +    if-eqz v4, :cond_87
2936 +
2937 +    new-instance v7, Landroid/telephony/cdma/CdmaCellLocation;
2938 +
2939 +    invoke-direct {v7}, Landroid/telephony/cdma/CdmaCellLocation;-><init>()V
2940 +
2941 +    invoke-virtual {v7, v5}, Landroid/telephony/cdma/CdmaCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2942 +
2943 +    :goto_4b
2944 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2945 +
2946 +    new-instance v10, Landroid/os/Bundle;
2947 +
2948 +    invoke-direct {v10, v5}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2949 +
2950 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2951 +
2952 +    const-string v8, "PrivacyTelephonyRegistry"
2953 +
2954 +    new-instance v10, Ljava/lang/StringBuilder;
2955 +
2956 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2957 +
2958 +    const-string v11, "package: "
2959 +
2960 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2961 +
2962 +    move-result-object v10
2963 +
2964 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2965 +
2966 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2967 +
2968 +    move-result-object v10
2969 +
2970 +    const-string v11, " blocked for CellLocation"
2971 +
2972 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2973 +
2974 +    move-result-object v10
2975 +
2976 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2977 +
2978 +    move-result-object v10
2979 +
2980 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2981 +    :try_end_75
2982 +    .catchall {:try_start_32 .. :try_end_75} :catchall_7f
2983 +    .catch Landroid/os/RemoteException; {:try_start_32 .. :try_end_75} :catch_76
2984 +
2985 +    goto :goto_1f
2986 +
2987 +    :catch_76
2988 +    move-exception v1
2989 +
2990 +    :try_start_77
2991 +    iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2992 +
2993 +    iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2994 +
2995 +    invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2996 +
2997 +    goto :goto_1f
2998 +
2999 +    :catchall_7f
3000 +    move-exception v8
3001 +
3002 +    monitor-exit v9
3003 +    :try_end_81
3004 +    .catchall {:try_start_77 .. :try_end_81} :catchall_7f
3005 +
3006 +    throw v8
3007 +
3008 +    :cond_82
3009 +    const/4 v4, 0x1
3010 +
3011 +    goto :goto_19
3012 +
3013 +    :catch_84
3014 +    move-exception v0
3015 +
3016 +    const/4 v2, 0x1
3017 +
3018 +    goto :goto_19
3019 +
3020 +    :cond_87
3021 +    :try_start_87
3022 +    new-instance v7, Landroid/telephony/gsm/GsmCellLocation;
3023 +
3024 +    invoke-direct {v7}, Landroid/telephony/gsm/GsmCellLocation;-><init>()V
3025 +
3026 +    invoke-virtual {v7, v5}, Landroid/telephony/gsm/GsmCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
3027 +
3028 +    goto :goto_4b
3029 +
3030 +    :cond_90
3031 +    iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3032 +
3033 +    new-instance v10, Landroid/os/Bundle;
3034 +
3035 +    invoke-direct {v10, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
3036 +
3037 +    invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
3038 +
3039 +    const-string v8, "PrivacyTelephonyRegistry"
3040 +
3041 +    new-instance v10, Ljava/lang/StringBuilder;
3042 +
3043 +    invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
3044 +
3045 +    const-string v11, "package: "
3046 +
3047 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3048 +
3049 +    move-result-object v10
3050 +
3051 +    iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3052 +
3053 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3054 +
3055 +    move-result-object v10
3056 +
3057 +    const-string v11, " allowed for CellLocation"
3058 +
3059 +    invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3060 +
3061 +    move-result-object v10
3062 +
3063 +    invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3064 +
3065 +    move-result-object v10
3066 +
3067 +    invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3068 +    :try_end_ba
3069 +    .catchall {:try_start_87 .. :try_end_ba} :catchall_7f
3070 +    .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_ba} :catch_76
3071 +
3072 +    goto/16 :goto_1f
3073 +
3074 +    :cond_bc
3075 +    :try_start_bc
3076 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3077 +
3078 +    monitor-exit v9
3079 +    :try_end_c0
3080 +    .catchall {:try_start_bc .. :try_end_c0} :catchall_7f
3081 +
3082 +    goto/16 :goto_8
3083 +.end method
3084 +
3085 +.method public bridge synthetic notifyDataActivity(I)V
3086 +    .registers 2
3087 +
3088 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyDataActivity(I)V
3089 +
3090 +    return-void
3091 +.end method
3092 +
3093 +.method public bridge synthetic notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
3094 +    .registers 10
3095 +
3096 +    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
3097 +
3098 +    return-void
3099 +.end method
3100 +
3101 +.method public bridge synthetic notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
3102 +    .registers 3
3103 +
3104 +    invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
3105 +
3106 +    return-void
3107 +.end method
3108 +
3109 +.method public bridge synthetic notifyMessageWaitingChanged(Z)V
3110 +    .registers 2
3111 +
3112 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyMessageWaitingChanged(Z)V
3113 +
3114 +    return-void
3115 +.end method
3116 +
3117 +.method public bridge synthetic notifyOtaspChanged(I)V
3118 +    .registers 2
3119 +
3120 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyOtaspChanged(I)V
3121 +
3122 +    return-void
3123 +.end method
3124 +
3125 +.method public notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
3126 +    .registers 10
3127 +
3128 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3129 +
3130 +    monitor-enter v4
3131 +
3132 +    :try_start_3
3133 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3134 +
3135 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3136 +
3137 +    move-result-object v1
3138 +
3139 +    :cond_9
3140 +    :goto_9
3141 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3142 +
3143 +    move-result v3
3144 +
3145 +    if-eqz v3, :cond_35
3146 +
3147 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3148 +
3149 +    move-result-object v2
3150 +
3151 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3152 +
3153 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3154 +    :try_end_17
3155 +    .catchall {:try_start_3 .. :try_end_17} :catchall_32
3156 +
3157 +    and-int/lit8 v3, v3, 0x20
3158 +
3159 +    if-eqz v3, :cond_9
3160 +
3161 +    :try_start_1b
3162 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3163 +
3164 +    invoke-virtual {v3, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
3165 +
3166 +    move-result v3
3167 +
3168 +    if-eqz v3, :cond_9
3169 +
3170 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3171 +
3172 +    invoke-interface {v3, p1, p2}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
3173 +    :try_end_28
3174 +    .catchall {:try_start_1b .. :try_end_28} :catchall_32
3175 +    .catch Landroid/os/RemoteException; {:try_start_1b .. :try_end_28} :catch_29
3176 +
3177 +    goto :goto_9
3178 +
3179 +    :catch_29
3180 +    move-exception v0
3181 +
3182 +    :try_start_2a
3183 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3184 +
3185 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3186 +
3187 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3188 +
3189 +    goto :goto_9
3190 +
3191 +    :catchall_32
3192 +    move-exception v3
3193 +
3194 +    monitor-exit v4
3195 +    :try_end_34
3196 +    .catchall {:try_start_2a .. :try_end_34} :catchall_32
3197 +
3198 +    throw v3
3199 +
3200 +    :cond_35
3201 +    :try_start_35
3202 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3203 +
3204 +    monitor-exit v4
3205 +    :try_end_39
3206 +    .catchall {:try_start_35 .. :try_end_39} :catchall_32
3207 +
3208 +    return-void
3209 +.end method
3210 +
3211 +.method public notifyServiceState(Landroid/telephony/ServiceState;)V
3212 +    .registers 9
3213 +
3214 +    const-string v3, "notifyServiceState()"
3215 +
3216 +    invoke-virtual {p0, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
3217 +
3218 +    move-result v3
3219 +
3220 +    if-nez v3, :cond_9
3221 +
3222 +    :goto_8
3223 +    return-void
3224 +
3225 +    :cond_9
3226 +    iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3227 +
3228 +    monitor-enter v4
3229 +
3230 +    :try_start_c
3231 +    iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
3232 +
3233 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3234 +
3235 +    invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3236 +
3237 +    move-result-object v1
3238 +
3239 +    :cond_14
3240 +    :goto_14
3241 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3242 +
3243 +    move-result v3
3244 +
3245 +    if-eqz v3, :cond_90
3246 +
3247 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3248 +
3249 +    move-result-object v2
3250 +
3251 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3252 +
3253 +    iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3254 +    :try_end_22
3255 +    .catchall {:try_start_c .. :try_end_22} :catchall_6c
3256 +
3257 +    and-int/lit8 v3, v3, 0x1
3258 +
3259 +    if-eqz v3, :cond_14
3260 +
3261 +    const/4 v3, 0x4
3262 +
3263 +    :try_start_27
3264 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3265 +
3266 +    invoke-direct {p0, v3, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
3267 +
3268 +    move-result v3
3269 +
3270 +    if-nez v3, :cond_6f
3271 +
3272 +    const-string v3, ""
3273 +
3274 +    const-string v5, ""
3275 +
3276 +    const-string v6, ""
3277 +
3278 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
3279 +
3280 +    const-string v3, "PrivacyTelephonyRegistry"
3281 +
3282 +    new-instance v5, Ljava/lang/StringBuilder;
3283 +
3284 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3285 +
3286 +    const-string v6, "package: "
3287 +
3288 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3289 +
3290 +    move-result-object v5
3291 +
3292 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3293 +
3294 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3295 +
3296 +    move-result-object v5
3297 +
3298 +    const-string v6, " blocked for Cellinfo"
3299 +
3300 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3301 +
3302 +    move-result-object v5
3303 +
3304 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3305 +
3306 +    move-result-object v5
3307 +
3308 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3309 +
3310 +    :goto_58
3311 +    iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3312 +
3313 +    new-instance v5, Landroid/telephony/ServiceState;
3314 +
3315 +    invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
3316 +
3317 +    invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
3318 +    :try_end_62
3319 +    .catchall {:try_start_27 .. :try_end_62} :catchall_6c
3320 +    .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_62} :catch_63
3321 +
3322 +    goto :goto_14
3323 +
3324 +    :catch_63
3325 +    move-exception v0
3326 +
3327 +    :try_start_64
3328 +    iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3329 +
3330 +    iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3331 +
3332 +    invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3333 +
3334 +    goto :goto_14
3335 +
3336 +    :catchall_6c
3337 +    move-exception v3
3338 +
3339 +    monitor-exit v4
3340 +    :try_end_6e
3341 +    .catchall {:try_start_64 .. :try_end_6e} :catchall_6c
3342 +
3343 +    throw v3
3344 +
3345 +    :cond_6f
3346 +    :try_start_6f
3347 +    const-string v3, "PrivacyTelephonyRegistry"
3348 +
3349 +    new-instance v5, Ljava/lang/StringBuilder;
3350 +
3351 +    invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3352 +
3353 +    const-string v6, "package: "
3354 +
3355 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3356 +
3357 +    move-result-object v5
3358 +
3359 +    iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3360 +
3361 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3362 +
3363 +    move-result-object v5
3364 +
3365 +    const-string v6, " allowed for Cellinfo"
3366 +
3367 +    invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3368 +
3369 +    move-result-object v5
3370 +
3371 +    invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3372 +
3373 +    move-result-object v5
3374 +
3375 +    invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3376 +    :try_end_8f
3377 +    .catchall {:try_start_6f .. :try_end_8f} :catchall_6c
3378 +    .catch Landroid/os/RemoteException; {:try_start_6f .. :try_end_8f} :catch_63
3379 +
3380 +    goto :goto_58
3381 +
3382 +    :cond_90
3383 +    :try_start_90
3384 +    invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3385 +
3386 +    monitor-exit v4
3387 +    :try_end_94
3388 +    .catchall {:try_start_90 .. :try_end_94} :catchall_6c
3389 +
3390 +    invoke-virtual {p0, p1}, Lcom/android/server/PrivacyTelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
3391 +
3392 +    goto/16 :goto_8
3393 +.end method
3394 +
3395 +.method public bridge synthetic notifySignalStrength(Landroid/telephony/SignalStrength;)V
3396 +    .registers 2
3397 +
3398 +    invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifySignalStrength(Landroid/telephony/SignalStrength;)V
3399 +
3400 +    return-void
3401 +.end method
3402 +
3403 +.method public bridge synthetic systemReady()V
3404 +    .registers 1
3405 +
3406 +    invoke-super {p0}, Lcom/android/server/TelephonyRegistry;->systemReady()V
3407 +
3408 +    return-void
3409 +.end method
3410 diff -Npru stock-services/smali/com/android/server/ServerThread.smali pdroid-services/smali/com/android/server/ServerThread.smali
3411 --- stock-services/smali/com/android/server/ServerThread.smali  2013-08-10 20:37:59.375214141 -0700
3412 +++ pdroid-services/smali/com/android/server/ServerThread.smali 2013-08-10 20:37:56.875214037 -0700
3413 @@ -24,6 +24,41 @@
3414      return-void
3415  .end method
3416
3417 +.method private addPrivacyService(Landroid/content/Context;)V
3418 +    .registers 5
3419 +
3420 +    :try_start_0
3421 +    const-string v1, "SystemServer"
3422 +
3423 +    const-string v2, "Privacy Service"
3424 +
3425 +    invoke-static {v1, v2}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3426 +
3427 +    const-string v1, "privacy"
3428 +
3429 +    new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
3430 +
3431 +    invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
3432 +
3433 +    invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3434 +    :try_end_11
3435 +    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
3436 +
3437 +    :goto_11
3438 +    return-void
3439 +
3440 +    :catch_12
3441 +    move-exception v0
3442 +
3443 +    const-string v1, "SystemServer"
3444 +
3445 +    const-string v2, "Failure starting Privacy Service"
3446 +
3447 +    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3448 +
3449 +    goto :goto_11
3450 +.end method
3451 +
3452  .method static final startSystemUi(Landroid/content/Context;)V
3453      .registers 5
3454
3455 @@ -135,7 +170,7 @@
3456
3457      const/16 v9, 0x31
3458
3459 -    if-ne v7, v9, :cond_7ad
3460 +    if-ne v7, v9, :cond_7b2
3461
3462      const/16 v110, 0x1
3463
3464 @@ -146,7 +181,7 @@
3465
3466      const/4 v9, 0x1
3467
3468 -    if-le v7, v9, :cond_7b1
3469 +    if-le v7, v9, :cond_7b6
3470
3471      const/4 v7, 0x1
3472
3473 @@ -182,7 +217,7 @@
3474
3475      move-result v7
3476
3477 -    if-eqz v7, :cond_7b5
3478 +    if-eqz v7, :cond_7ba
3479
3480      const/16 v84, 0x0
3481
3482 @@ -336,7 +371,7 @@
3483
3484      invoke-direct/range {v92 .. v92}, Lcom/android/server/pm/Installer;-><init>()V
3485      :try_end_ff
3486 -    .catch Ljava/lang/RuntimeException; {:try_start_f3 .. :try_end_ff} :catch_b3c
3487 +    .catch Ljava/lang/RuntimeException; {:try_start_f3 .. :try_end_ff} :catch_b41
3488
3489      :try_start_ff
3490      invoke-virtual/range {v92 .. v92}, Lcom/android/server/pm/Installer;->ping()Z
3491 @@ -351,7 +386,7 @@
3492
3493      invoke-direct {v4}, Lcom/android/server/power/PowerManagerService;-><init>()V
3494      :try_end_10e
3495 -    .catch Ljava/lang/RuntimeException; {:try_start_ff .. :try_end_10e} :catch_b4b
3496 +    .catch Ljava/lang/RuntimeException; {:try_start_ff .. :try_end_10e} :catch_b50
3497
3498      :try_start_10e
3499      const-string v7, "power"
3500 @@ -382,7 +417,7 @@
3501
3502      invoke-direct {v10, v5, v0, v1}, Lcom/android/server/display/DisplayManagerService;-><init>(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Handler;)V
3503      :try_end_12e
3504 -    .catch Ljava/lang/RuntimeException; {:try_start_10e .. :try_end_12e} :catch_b5c
3505 +    .catch Ljava/lang/RuntimeException; {:try_start_10e .. :try_end_12e} :catch_b61
3506
3507      :try_start_12e
3508      const-string v7, "display"
3509 @@ -397,13 +432,13 @@
3510
3511      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3512
3513 -    new-instance v120, Lcom/android/server/TelephonyRegistry;
3514 +    new-instance v120, Lcom/android/server/PrivacyTelephonyRegistry;
3515
3516      move-object/from16 v0, v120
3517
3518 -    invoke-direct {v0, v5}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
3519 +    invoke-direct {v0, v5}, Lcom/android/server/PrivacyTelephonyRegistry;-><init>(Landroid/content/Context;)V
3520      :try_end_142
3521 -    .catch Ljava/lang/RuntimeException; {:try_start_12e .. :try_end_142} :catch_b6b
3522 +    .catch Ljava/lang/RuntimeException; {:try_start_12e .. :try_end_142} :catch_b70
3523
3524      :try_start_142
3525      const-string v7, "telephony.registry"
3526 @@ -465,7 +500,7 @@
3527
3528      move-result v7
3529
3530 -    if-eqz v7, :cond_7bb
3531 +    if-eqz v7, :cond_7c0
3532
3533      const-string v7, "SystemServer"
3534
3535 @@ -477,7 +512,7 @@
3536
3537      :cond_18f
3538      :goto_18f
3539 -    if-eqz v84, :cond_7d0
3540 +    if-eqz v84, :cond_7d5
3541
3542      const/4 v7, 0x1
3543
3544 @@ -488,7 +523,7 @@
3545
3546      invoke-static {v5, v0, v7, v1}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;Lcom/android/server/pm/Installer;ZZ)Landroid/content/pm/IPackageManager;
3547      :try_end_199
3548 -    .catch Ljava/lang/RuntimeException; {:try_start_142 .. :try_end_199} :catch_7df
3549 +    .catch Ljava/lang/RuntimeException; {:try_start_142 .. :try_end_199} :catch_7e4
3550
3551      move-result-object v107
3552
3553 @@ -497,8 +532,8 @@
3554      :try_start_19c
3555      invoke-interface/range {v107 .. v107}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3556      :try_end_19f
3557 -    .catch Landroid/os/RemoteException; {:try_start_19c .. :try_end_19f} :catch_ad4
3558 -    .catch Ljava/lang/RuntimeException; {:try_start_19c .. :try_end_19f} :catch_7df
3559 +    .catch Landroid/os/RemoteException; {:try_start_19c .. :try_end_19f} :catch_ad9
3560 +    .catch Ljava/lang/RuntimeException; {:try_start_19c .. :try_end_19f} :catch_7e4
3561
3562      move-result v87
3563
3564 @@ -542,7 +577,7 @@
3565
3566      iput-object v7, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3567      :try_end_1cc
3568 -    .catch Ljava/lang/RuntimeException; {:try_start_1a0 .. :try_end_1cc} :catch_7df
3569 +    .catch Ljava/lang/RuntimeException; {:try_start_1a0 .. :try_end_1cc} :catch_7e4
3570
3571      :try_start_1cc
3572      const-string v7, "SystemServer"
3573 @@ -557,8 +592,8 @@
3574
3575      invoke-direct {v0, v5}, Lcom/android/server/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3576      :try_end_1da
3577 -    .catch Ljava/lang/Throwable; {:try_start_1cc .. :try_end_1da} :catch_7d3
3578 -    .catch Ljava/lang/RuntimeException; {:try_start_1cc .. :try_end_1da} :catch_7df
3579 +    .catch Ljava/lang/Throwable; {:try_start_1cc .. :try_end_1da} :catch_7d8
3580 +    .catch Ljava/lang/RuntimeException; {:try_start_1cc .. :try_end_1da} :catch_7e4
3581
3582      :try_start_1da
3583      const-string v7, "account"
3584 @@ -567,8 +602,8 @@
3585
3586      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3587      :try_end_1e1
3588 -    .catch Ljava/lang/Throwable; {:try_start_1da .. :try_end_1e1} :catch_bc4
3589 -    .catch Ljava/lang/RuntimeException; {:try_start_1da .. :try_end_1e1} :catch_b78
3590 +    .catch Ljava/lang/Throwable; {:try_start_1da .. :try_end_1e1} :catch_bc9
3591 +    .catch Ljava/lang/RuntimeException; {:try_start_1da .. :try_end_1e1} :catch_b7d
3592
3593      move-object/from16 v59, v60
3594
3595 @@ -584,7 +619,7 @@
3596
3597      move/from16 v0, v84
3598
3599 -    if-ne v0, v7, :cond_7fe
3600 +    if-ne v0, v7, :cond_803
3601
3602      const/4 v7, 0x1
3603
3604 @@ -593,6 +628,10 @@
3605
3606      move-result-object v72
3607
3608 +    move-object/from16 v0, p0
3609 +
3610 +    invoke-direct {v0, v5}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
3611 +
3612      const-string v7, "SystemServer"
3613
3614      const-string v9, "System Content Providers"
3615 @@ -610,10 +649,10 @@
3616      new-instance v6, Lcom/android/server/LightsService;
3617
3618      invoke-direct {v6, v5}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3619 -    :try_end_20a
3620 -    .catch Ljava/lang/RuntimeException; {:try_start_1e3 .. :try_end_20a} :catch_7df
3621 +    :try_end_20f
3622 +    .catch Ljava/lang/RuntimeException; {:try_start_1e3 .. :try_end_20f} :catch_7e4
3623
3624 -    :try_start_20a
3625 +    :try_start_20f
3626      const-string v7, "SystemServer"
3627
3628      const-string v9, "Battery Service"
3629 @@ -623,10 +662,10 @@
3630      new-instance v8, Lcom/android/server/BatteryService;
3631
3632      invoke-direct {v8, v5, v6}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3633 -    :try_end_216
3634 -    .catch Ljava/lang/RuntimeException; {:try_start_20a .. :try_end_216} :catch_b89
3635 +    :try_end_21b
3636 +    .catch Ljava/lang/RuntimeException; {:try_start_20f .. :try_end_21b} :catch_b8e
3637
3638 -    :try_start_216
3639 +    :try_start_21b
3640      const-string v7, "battery"
3641
3642      invoke-static {v7, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3643 @@ -642,10 +681,10 @@
3644      move-object/from16 v0, v131
3645
3646      invoke-direct {v0, v5}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3647 -    :try_end_229
3648 -    .catch Ljava/lang/RuntimeException; {:try_start_216 .. :try_end_229} :catch_b96
3649 +    :try_end_22e
3650 +    .catch Ljava/lang/RuntimeException; {:try_start_21b .. :try_end_22e} :catch_b9b
3651
3652 -    :try_start_229
3653 +    :try_start_22e
3654      const-string v7, "vibrator"
3655
3656      move-object/from16 v0, v131
3657 @@ -671,10 +710,10 @@
3658      new-instance v15, Lcom/android/server/AlarmManagerService;
3659
3660      invoke-direct {v15, v5}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
3661 -    :try_end_247
3662 -    .catch Ljava/lang/RuntimeException; {:try_start_229 .. :try_end_247} :catch_ba1
3663 +    :try_end_24c
3664 +    .catch Ljava/lang/RuntimeException; {:try_start_22e .. :try_end_24c} :catch_ba6
3665
3666 -    :try_start_247
3667 +    :try_start_24c
3668      const-string v7, "alarm"
3669
3670      invoke-static {v7, v15}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3671 @@ -714,10 +753,10 @@
3672      move-object/from16 v1, v21
3673
3674      invoke-direct {v0, v5, v1}, Lcom/android/server/input/InputManagerService;-><init>(Landroid/content/Context;Landroid/os/Handler;)V
3675 -    :try_end_271
3676 -    .catch Ljava/lang/RuntimeException; {:try_start_247 .. :try_end_271} :catch_bae
3677 +    :try_end_276
3678 +    .catch Ljava/lang/RuntimeException; {:try_start_24c .. :try_end_276} :catch_bb3
3679
3680 -    :try_start_271
3681 +    :try_start_276
3682      const-string v7, "SystemServer"
3683
3684      const-string v9, "Window Manager"
3685 @@ -728,16 +767,16 @@
3686
3687      move/from16 v0, v84
3688
3689 -    if-eq v0, v7, :cond_801
3690 +    if-eq v0, v7, :cond_806
3691
3692      const/16 v22, 0x1
3693
3694 -    :goto_27f
3695 -    if-nez v87, :cond_805
3696 +    :goto_284
3697 +    if-nez v87, :cond_80a
3698
3699      const/16 v23, 0x1
3700
3701 -    :goto_283
3702 +    :goto_288
3703      move-object/from16 v16, v5
3704
3705      move-object/from16 v17, v4
3706 @@ -798,24 +837,24 @@
3707
3708      move-result v7
3709
3710 -    if-eqz v7, :cond_809
3711 +    if-eqz v7, :cond_80e
3712
3713      const-string v7, "SystemServer"
3714
3715      const-string v9, "No Bluetooh Service (emulator)"
3716
3717      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3718 -    :try_end_2cf
3719 -    .catch Ljava/lang/RuntimeException; {:try_start_271 .. :try_end_2cf} :catch_817
3720 +    :try_end_2d4
3721 +    .catch Ljava/lang/RuntimeException; {:try_start_276 .. :try_end_2d4} :catch_81c
3722
3723 -    :goto_2cf
3724 +    :goto_2d4
3725      move-object/from16 v119, v120
3726
3727      move-object/from16 v130, v131
3728
3729      move-object/from16 v91, v92
3730
3731 -    :goto_2d5
3732 +    :goto_2da
3733      const/16 v76, 0x0
3734
3735      const/16 v117, 0x0
3736 @@ -842,9 +881,9 @@
3737
3738      move/from16 v0, v84
3739
3740 -    if-eq v0, v7, :cond_31a
3741 +    if-eq v0, v7, :cond_31f
3742
3743 -    :try_start_2f0
3744 +    :try_start_2f5
3745      const-string v7, "SystemServer"
3746
3747      const-string v9, "Input Method Service"
3748 @@ -858,22 +897,22 @@
3749      move-object/from16 v1, v139
3750
3751      invoke-direct {v0, v5, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3752 -    :try_end_300
3753 -    .catch Ljava/lang/Throwable; {:try_start_2f0 .. :try_end_300} :catch_84d
3754 +    :try_end_305
3755 +    .catch Ljava/lang/Throwable; {:try_start_2f5 .. :try_end_305} :catch_852
3756
3757 -    :try_start_300
3758 +    :try_start_305
3759      const-string v7, "input_method"
3760
3761      move-object/from16 v0, v89
3762
3763      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3764 -    :try_end_307
3765 -    .catch Ljava/lang/Throwable; {:try_start_300 .. :try_end_307} :catch_b37
3766 +    :try_end_30c
3767 +    .catch Ljava/lang/Throwable; {:try_start_305 .. :try_end_30c} :catch_b3c
3768
3769      move-object/from16 v88, v89
3770
3771 -    :goto_309
3772 -    :try_start_309
3773 +    :goto_30e
3774 +    :try_start_30e
3775      const-string v7, "SystemServer"
3776
3777      const-string v9, "Accessibility Manager"
3778 @@ -887,24 +926,24 @@
3779      invoke-direct {v9, v5}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
3780
3781      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3782 -    :try_end_31a
3783 -    .catch Ljava/lang/Throwable; {:try_start_309 .. :try_end_31a} :catch_859
3784 +    :try_end_31f
3785 +    .catch Ljava/lang/Throwable; {:try_start_30e .. :try_end_31f} :catch_85e
3786
3787 -    :cond_31a
3788 -    :goto_31a
3789 -    :try_start_31a
3790 +    :cond_31f
3791 +    :goto_31f
3792 +    :try_start_31f
3793      invoke-virtual/range {v139 .. v139}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3794 -    :try_end_31d
3795 -    .catch Ljava/lang/Throwable; {:try_start_31a .. :try_end_31d} :catch_865
3796 +    :try_end_322
3797 +    .catch Ljava/lang/Throwable; {:try_start_31f .. :try_end_322} :catch_86a
3798
3799 -    :goto_31d
3800 -    :try_start_31d
3801 +    :goto_322
3802 +    :try_start_322
3803      invoke-interface/range {v107 .. v107}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3804 -    :try_end_320
3805 -    .catch Ljava/lang/Throwable; {:try_start_31d .. :try_end_320} :catch_871
3806 +    :try_end_325
3807 +    .catch Ljava/lang/Throwable; {:try_start_322 .. :try_end_325} :catch_876
3808
3809 -    :goto_320
3810 -    :try_start_320
3811 +    :goto_325
3812 +    :try_start_325
3813      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3814
3815      move-result-object v7
3816 @@ -922,15 +961,15 @@
3817      const/4 v11, 0x0
3818
3819      invoke-interface {v7, v9, v11}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3820 -    :try_end_333
3821 -    .catch Landroid/os/RemoteException; {:try_start_320 .. :try_end_333} :catch_b34
3822 +    :try_end_338
3823 +    .catch Landroid/os/RemoteException; {:try_start_325 .. :try_end_338} :catch_b39
3824
3825 -    :goto_333
3826 +    :goto_338
3827      const/4 v7, 0x1
3828
3829      move/from16 v0, v84
3830
3831 -    if-eq v0, v7, :cond_bc9
3832 +    if-eq v0, v7, :cond_bce
3833
3834      const-string v7, "0"
3835
3836 @@ -944,9 +983,9 @@
3837
3838      move-result v7
3839
3840 -    if-nez v7, :cond_35d
3841 +    if-nez v7, :cond_362
3842
3843 -    :try_start_346
3844 +    :try_start_34b
3845      const-string v7, "SystemServer"
3846
3847      const-string v9, "Mount Service"
3848 @@ -958,23 +997,23 @@
3849      move-object/from16 v0, v100
3850
3851      invoke-direct {v0, v5}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3852 -    :try_end_354
3853 -    .catch Ljava/lang/Throwable; {:try_start_346 .. :try_end_354} :catch_87d
3854 +    :try_end_359
3855 +    .catch Ljava/lang/Throwable; {:try_start_34b .. :try_end_359} :catch_882
3856
3857 -    :try_start_354
3858 +    :try_start_359
3859      const-string v7, "mount"
3860
3861      move-object/from16 v0, v100
3862
3863      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3864 -    :try_end_35b
3865 -    .catch Ljava/lang/Throwable; {:try_start_354 .. :try_end_35b} :catch_b2f
3866 +    :try_end_360
3867 +    .catch Ljava/lang/Throwable; {:try_start_359 .. :try_end_360} :catch_b34
3868
3869      move-object/from16 v99, v100
3870
3871 -    :cond_35d
3872 -    :goto_35d
3873 -    :try_start_35d
3874 +    :cond_362
3875 +    :goto_362
3876 +    :try_start_362
3877      const-string v7, "SystemServer"
3878
3879      const-string v9, "LockSettingsService"
3880 @@ -986,22 +1025,22 @@
3881      move-object/from16 v0, v97
3882
3883      invoke-direct {v0, v5}, Lcom/android/server/LockSettingsService;-><init>(Landroid/content/Context;)V
3884 -    :try_end_36b
3885 -    .catch Ljava/lang/Throwable; {:try_start_35d .. :try_end_36b} :catch_889
3886 +    :try_end_370
3887 +    .catch Ljava/lang/Throwable; {:try_start_362 .. :try_end_370} :catch_88e
3888
3889 -    :try_start_36b
3890 +    :try_start_370
3891      const-string v7, "lock_settings"
3892
3893      move-object/from16 v0, v97
3894
3895      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3896 -    :try_end_372
3897 -    .catch Ljava/lang/Throwable; {:try_start_36b .. :try_end_372} :catch_b2a
3898 +    :try_end_377
3899 +    .catch Ljava/lang/Throwable; {:try_start_370 .. :try_end_377} :catch_b2f
3900
3901      move-object/from16 v96, v97
3902
3903 -    :goto_374
3904 -    :try_start_374
3905 +    :goto_379
3906 +    :try_start_379
3907      const-string v7, "SystemServer"
3908
3909      const-string v9, "Device Policy"
3910 @@ -1013,22 +1052,22 @@
3911      move-object/from16 v0, v77
3912
3913      invoke-direct {v0, v5}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3914 -    :try_end_382
3915 -    .catch Ljava/lang/Throwable; {:try_start_374 .. :try_end_382} :catch_895
3916 +    :try_end_387
3917 +    .catch Ljava/lang/Throwable; {:try_start_379 .. :try_end_387} :catch_89a
3918
3919 -    :try_start_382
3920 +    :try_start_387
3921      const-string v7, "device_policy"
3922
3923      move-object/from16 v0, v77
3924
3925      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3926 -    :try_end_389
3927 -    .catch Ljava/lang/Throwable; {:try_start_382 .. :try_end_389} :catch_b25
3928 +    :try_end_38e
3929 +    .catch Ljava/lang/Throwable; {:try_start_387 .. :try_end_38e} :catch_b2a
3930
3931      move-object/from16 v76, v77
3932
3933 -    :goto_38b
3934 -    :try_start_38b
3935 +    :goto_390
3936 +    :try_start_390
3937      const-string v7, "SystemServer"
3938
3939      const-string v9, "Status Bar"
3940 @@ -1042,22 +1081,22 @@
3941      move-object/from16 v1, v139
3942
3943      invoke-direct {v0, v5, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3944 -    :try_end_39b
3945 -    .catch Ljava/lang/Throwable; {:try_start_38b .. :try_end_39b} :catch_8a1
3946 +    :try_end_3a0
3947 +    .catch Ljava/lang/Throwable; {:try_start_390 .. :try_end_3a0} :catch_8a6
3948
3949 -    :try_start_39b
3950 +    :try_start_3a0
3951      const-string v7, "statusbar"
3952
3953      move-object/from16 v0, v118
3954
3955      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3956 -    :try_end_3a2
3957 -    .catch Ljava/lang/Throwable; {:try_start_39b .. :try_end_3a2} :catch_b20
3958 +    :try_end_3a7
3959 +    .catch Ljava/lang/Throwable; {:try_start_3a0 .. :try_end_3a7} :catch_b25
3960
3961      move-object/from16 v117, v118
3962
3963 -    :goto_3a4
3964 -    :try_start_3a4
3965 +    :goto_3a9
3966 +    :try_start_3a9
3967      const-string v7, "SystemServer"
3968
3969      const-string v9, "Clipboard Service"
3970 @@ -1071,11 +1110,11 @@
3971      invoke-direct {v9, v5}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
3972
3973      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3974 -    :try_end_3b5
3975 -    .catch Ljava/lang/Throwable; {:try_start_3a4 .. :try_end_3b5} :catch_8ad
3976 +    :try_end_3ba
3977 +    .catch Ljava/lang/Throwable; {:try_start_3a9 .. :try_end_3ba} :catch_8b2
3978
3979 -    :goto_3b5
3980 -    :try_start_3b5
3981 +    :goto_3ba
3982 +    :try_start_3ba
3983      const-string v7, "SystemServer"
3984
3985      const-string v9, "NetworkManagement Service"
3986 @@ -1091,11 +1130,11 @@
3987      move-object/from16 v0, v30
3988
3989      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3990 -    :try_end_3c7
3991 -    .catch Ljava/lang/Throwable; {:try_start_3b5 .. :try_end_3c7} :catch_8b9
3992 +    :try_end_3cc
3993 +    .catch Ljava/lang/Throwable; {:try_start_3ba .. :try_end_3cc} :catch_8be
3994
3995 -    :goto_3c7
3996 -    :try_start_3c7
3997 +    :goto_3cc
3998 +    :try_start_3cc
3999      const-string v7, "SystemServer"
4000
4001      const-string v9, "Text Service Manager Service"
4002 @@ -1107,22 +1146,22 @@
4003      move-object/from16 v0, v122
4004
4005      invoke-direct {v0, v5}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
4006 -    :try_end_3d5
4007 -    .catch Ljava/lang/Throwable; {:try_start_3c7 .. :try_end_3d5} :catch_8c5
4008 +    :try_end_3da
4009 +    .catch Ljava/lang/Throwable; {:try_start_3cc .. :try_end_3da} :catch_8ca
4010
4011 -    :try_start_3d5
4012 +    :try_start_3da
4013      const-string v7, "textservices"
4014
4015      move-object/from16 v0, v122
4016
4017      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4018 -    :try_end_3dc
4019 -    .catch Ljava/lang/Throwable; {:try_start_3d5 .. :try_end_3dc} :catch_b1b
4020 +    :try_end_3e1
4021 +    .catch Ljava/lang/Throwable; {:try_start_3da .. :try_end_3e1} :catch_b20
4022
4023      move-object/from16 v121, v122
4024
4025 -    :goto_3de
4026 -    :try_start_3de
4027 +    :goto_3e3
4028 +    :try_start_3e3
4029      const-string v7, "SystemServer"
4030
4031      const-string v9, "NetworkStats Service"
4032 @@ -1136,22 +1175,22 @@
4033      move-object/from16 v1, v30
4034
4035      invoke-direct {v0, v5, v1, v15}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
4036 -    :try_end_3ee
4037 -    .catch Ljava/lang/Throwable; {:try_start_3de .. :try_end_3ee} :catch_8d1
4038 +    :try_end_3f3
4039 +    .catch Ljava/lang/Throwable; {:try_start_3e3 .. :try_end_3f3} :catch_8d6
4040
4041 -    :try_start_3ee
4042 +    :try_start_3f3
4043      const-string v7, "netstats"
4044
4045      move-object/from16 v0, v102
4046
4047      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4048 -    :try_end_3f5
4049 -    .catch Ljava/lang/Throwable; {:try_start_3ee .. :try_end_3f5} :catch_b16
4050 +    :try_end_3fa
4051 +    .catch Ljava/lang/Throwable; {:try_start_3f3 .. :try_end_3fa} :catch_b1b
4052
4053      move-object/from16 v29, v102
4054
4055 -    :goto_3f7
4056 -    :try_start_3f7
4057 +    :goto_3fc
4058 +    :try_start_3fc
4059      const-string v7, "SystemServer"
4060
4061      const-string v9, "NetworkPolicy Service"
4062 @@ -1169,20 +1208,20 @@
4063      move-object/from16 v28, v4
4064
4065      invoke-direct/range {v25 .. v30}, Lcom/android/server/net/NetworkPolicyManagerService;-><init>(Landroid/content/Context;Landroid/app/IActivityManager;Landroid/os/IPowerManager;Landroid/net/INetworkStatsService;Landroid/os/INetworkManagementService;)V
4066 -    :try_end_40b
4067 -    .catch Ljava/lang/Throwable; {:try_start_3f7 .. :try_end_40b} :catch_8dd
4068 +    :try_end_410
4069 +    .catch Ljava/lang/Throwable; {:try_start_3fc .. :try_end_410} :catch_8e2
4070
4071 -    :try_start_40b
4072 +    :try_start_410
4073      const-string v7, "netpolicy"
4074
4075      move-object/from16 v0, v25
4076
4077      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4078 -    :try_end_412
4079 -    .catch Ljava/lang/Throwable; {:try_start_40b .. :try_end_412} :catch_b13
4080 +    :try_end_417
4081 +    .catch Ljava/lang/Throwable; {:try_start_410 .. :try_end_417} :catch_b18
4082
4083 -    :goto_412
4084 -    :try_start_412
4085 +    :goto_417
4086 +    :try_start_417
4087      const-string v7, "SystemServer"
4088
4089      const-string v9, "Wi-Fi P2pService"
4090 @@ -1194,22 +1233,22 @@
4091      move-object/from16 v0, v138
4092
4093      invoke-direct {v0, v5}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
4094 -    :try_end_420
4095 -    .catch Ljava/lang/Throwable; {:try_start_412 .. :try_end_420} :catch_8eb
4096 +    :try_end_425
4097 +    .catch Ljava/lang/Throwable; {:try_start_417 .. :try_end_425} :catch_8f0
4098
4099 -    :try_start_420
4100 +    :try_start_425
4101      const-string v7, "wifip2p"
4102
4103      move-object/from16 v0, v138
4104
4105      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4106 -    :try_end_427
4107 -    .catch Ljava/lang/Throwable; {:try_start_420 .. :try_end_427} :catch_b0e
4108 +    :try_end_42c
4109 +    .catch Ljava/lang/Throwable; {:try_start_425 .. :try_end_42c} :catch_b13
4110
4111      move-object/from16 v137, v138
4112
4113 -    :goto_429
4114 -    :try_start_429
4115 +    :goto_42e
4116 +    :try_start_42e
4117      const-string v7, "SystemServer"
4118
4119      const-string v9, "Wi-Fi Service"
4120 @@ -1221,22 +1260,22 @@
4121      move-object/from16 v0, v136
4122
4123      invoke-direct {v0, v5}, Lcom/android/server/wifi/WifiService;-><init>(Landroid/content/Context;)V
4124 -    :try_end_437
4125 -    .catch Ljava/lang/Throwable; {:try_start_429 .. :try_end_437} :catch_8f7
4126 +    :try_end_43c
4127 +    .catch Ljava/lang/Throwable; {:try_start_42e .. :try_end_43c} :catch_8fc
4128
4129 -    :try_start_437
4130 +    :try_start_43c
4131      const-string v7, "wifi"
4132
4133      move-object/from16 v0, v136
4134
4135      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4136 -    :try_end_43e
4137 -    .catch Ljava/lang/Throwable; {:try_start_437 .. :try_end_43e} :catch_b09
4138 +    :try_end_443
4139 +    .catch Ljava/lang/Throwable; {:try_start_43c .. :try_end_443} :catch_b0e
4140
4141      move-object/from16 v135, v136
4142
4143 -    :goto_440
4144 -    :try_start_440
4145 +    :goto_445
4146 +    :try_start_445
4147      const-string v7, "SystemServer"
4148
4149      const-string v9, "Connectivity Service"
4150 @@ -1254,10 +1293,10 @@
4151      move-object/from16 v3, v25
4152
4153      invoke-direct {v0, v5, v1, v2, v3}, Lcom/android/server/ConnectivityService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/net/INetworkStatsService;Landroid/net/INetworkPolicyManager;)V
4154 -    :try_end_454
4155 -    .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_454} :catch_903
4156 +    :try_end_459
4157 +    .catch Ljava/lang/Throwable; {:try_start_445 .. :try_end_459} :catch_908
4158
4159 -    :try_start_454
4160 +    :try_start_459
4161      const-string v7, "connectivity"
4162
4163      move-object/from16 v0, v71
4164 @@ -1279,13 +1318,13 @@
4165      invoke-virtual/range {v135 .. v135}, Lcom/android/server/wifi/WifiService;->checkAndStartWifi()V
4166
4167      invoke-virtual/range {v137 .. v137}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
4168 -    :try_end_46f
4169 -    .catch Ljava/lang/Throwable; {:try_start_454 .. :try_end_46f} :catch_b04
4170 +    :try_end_474
4171 +    .catch Ljava/lang/Throwable; {:try_start_459 .. :try_end_474} :catch_b09
4172
4173      move-object/from16 v70, v71
4174
4175 -    :goto_471
4176 -    :try_start_471
4177 +    :goto_476
4178 +    :try_start_476
4179      const-string v7, "SystemServer"
4180
4181      const-string v9, "Network Service Discovery Service"
4182 @@ -1301,11 +1340,11 @@
4183      move-object/from16 v0, v115
4184
4185      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4186 -    :try_end_483
4187 -    .catch Ljava/lang/Throwable; {:try_start_471 .. :try_end_483} :catch_90f
4188 +    :try_end_488
4189 +    .catch Ljava/lang/Throwable; {:try_start_476 .. :try_end_488} :catch_914
4190
4191 -    :goto_483
4192 -    :try_start_483
4193 +    :goto_488
4194 +    :try_start_488
4195      const-string v7, "SystemServer"
4196
4197      const-string v9, "UpdateLock Service"
4198 @@ -1319,34 +1358,34 @@
4199      invoke-direct {v9, v5}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
4200
4201      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4202 -    :try_end_494
4203 -    .catch Ljava/lang/Throwable; {:try_start_483 .. :try_end_494} :catch_91b
4204 +    :try_end_499
4205 +    .catch Ljava/lang/Throwable; {:try_start_488 .. :try_end_499} :catch_920
4206
4207 -    :goto_494
4208 -    if-eqz v99, :cond_499
4209 +    :goto_499
4210 +    if-eqz v99, :cond_49e
4211
4212      invoke-virtual/range {v99 .. v99}, Lcom/android/server/MountService;->waitForAsecScan()V
4213
4214 -    :cond_499
4215 -    if-eqz v59, :cond_49e
4216 -
4217 -    :try_start_49b
4218 -    invoke-virtual/range {v59 .. v59}, Lcom/android/server/accounts/AccountManagerService;->systemReady()V
4219 -    :try_end_49e
4220 -    .catch Ljava/lang/Throwable; {:try_start_49b .. :try_end_49e} :catch_927
4221 -
4222      :cond_49e
4223 -    :goto_49e
4224 -    if-eqz v72, :cond_4a3
4225 +    if-eqz v59, :cond_4a3
4226
4227      :try_start_4a0
4228 -    invoke-virtual/range {v72 .. v72}, Lcom/android/server/content/ContentService;->systemReady()V
4229 +    invoke-virtual/range {v59 .. v59}, Lcom/android/server/accounts/AccountManagerService;->systemReady()V
4230      :try_end_4a3
4231 -    .catch Ljava/lang/Throwable; {:try_start_4a0 .. :try_end_4a3} :catch_933
4232 +    .catch Ljava/lang/Throwable; {:try_start_4a0 .. :try_end_4a3} :catch_92c
4233
4234      :cond_4a3
4235      :goto_4a3
4236 -    :try_start_4a3
4237 +    if-eqz v72, :cond_4a8
4238 +
4239 +    :try_start_4a5
4240 +    invoke-virtual/range {v72 .. v72}, Lcom/android/server/content/ContentService;->systemReady()V
4241 +    :try_end_4a8
4242 +    .catch Ljava/lang/Throwable; {:try_start_4a5 .. :try_end_4a8} :catch_938
4243 +
4244 +    :cond_4a8
4245 +    :goto_4a8
4246 +    :try_start_4a8
4247      const-string v7, "SystemServer"
4248
4249      const-string v9, "Notification Manager"
4250 @@ -1360,10 +1399,10 @@
4251      move-object/from16 v1, v117
4252
4253      invoke-direct {v0, v5, v1, v6}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4254 -    :try_end_4b3
4255 -    .catch Ljava/lang/Throwable; {:try_start_4a3 .. :try_end_4b3} :catch_93f
4256 +    :try_end_4b8
4257 +    .catch Ljava/lang/Throwable; {:try_start_4a8 .. :try_end_4b8} :catch_944
4258
4259 -    :try_start_4b3
4260 +    :try_start_4b8
4261      const-string v7, "notification"
4262
4263      move-object/from16 v0, v106
4264 @@ -1375,13 +1414,13 @@
4265      move-object/from16 v1, v106
4266
4267      invoke-virtual {v0, v1}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4268 -    :try_end_4c1
4269 -    .catch Ljava/lang/Throwable; {:try_start_4b3 .. :try_end_4c1} :catch_aff
4270 +    :try_end_4c6
4271 +    .catch Ljava/lang/Throwable; {:try_start_4b8 .. :try_end_4c6} :catch_b04
4272
4273      move-object/from16 v105, v106
4274
4275 -    :goto_4c3
4276 -    :try_start_4c3
4277 +    :goto_4c8
4278 +    :try_start_4c8
4279      const-string v7, "SystemServer"
4280
4281      const-string v9, "Device Storage Monitor"
4282 @@ -1395,11 +1434,11 @@
4283      invoke-direct {v9, v5}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4284
4285      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4286 -    :try_end_4d4
4287 -    .catch Ljava/lang/Throwable; {:try_start_4c3 .. :try_end_4d4} :catch_94b
4288 +    :try_end_4d9
4289 +    .catch Ljava/lang/Throwable; {:try_start_4c8 .. :try_end_4d9} :catch_950
4290
4291 -    :goto_4d4
4292 -    :try_start_4d4
4293 +    :goto_4d9
4294 +    :try_start_4d9
4295      const-string v7, "SystemServer"
4296
4297      const-string v9, "Location Manager"
4298 @@ -1411,22 +1450,22 @@
4299      move-object/from16 v0, v95
4300
4301      invoke-direct {v0, v5}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4302 -    :try_end_4e2
4303 -    .catch Ljava/lang/Throwable; {:try_start_4d4 .. :try_end_4e2} :catch_957
4304 +    :try_end_4e7
4305 +    .catch Ljava/lang/Throwable; {:try_start_4d9 .. :try_end_4e7} :catch_95c
4306
4307 -    :try_start_4e2
4308 +    :try_start_4e7
4309      const-string v7, "location"
4310
4311      move-object/from16 v0, v95
4312
4313      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4314 -    :try_end_4e9
4315 -    .catch Ljava/lang/Throwable; {:try_start_4e2 .. :try_end_4e9} :catch_afa
4316 +    :try_end_4ee
4317 +    .catch Ljava/lang/Throwable; {:try_start_4e7 .. :try_end_4ee} :catch_aff
4318
4319      move-object/from16 v94, v95
4320
4321 -    :goto_4eb
4322 -    :try_start_4eb
4323 +    :goto_4f0
4324 +    :try_start_4f0
4325      const-string v7, "SystemServer"
4326
4327      const-string v9, "Country Detector"
4328 @@ -1438,22 +1477,22 @@
4329      move-object/from16 v0, v74
4330
4331      invoke-direct {v0, v5}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4332 -    :try_end_4f9
4333 -    .catch Ljava/lang/Throwable; {:try_start_4eb .. :try_end_4f9} :catch_963
4334 +    :try_end_4fe
4335 +    .catch Ljava/lang/Throwable; {:try_start_4f0 .. :try_end_4fe} :catch_968
4336
4337 -    :try_start_4f9
4338 +    :try_start_4fe
4339      const-string v7, "country_detector"
4340
4341      move-object/from16 v0, v74
4342
4343      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4344 -    :try_end_500
4345 -    .catch Ljava/lang/Throwable; {:try_start_4f9 .. :try_end_500} :catch_af5
4346 +    :try_end_505
4347 +    .catch Ljava/lang/Throwable; {:try_start_4fe .. :try_end_505} :catch_afa
4348
4349      move-object/from16 v73, v74
4350
4351 -    :goto_502
4352 -    :try_start_502
4353 +    :goto_507
4354 +    :try_start_507
4355      const-string v7, "SystemServer"
4356
4357      const-string v9, "Search Service"
4358 @@ -1467,11 +1506,11 @@
4359      invoke-direct {v9, v5}, Lcom/android/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4360
4361      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4362 -    :try_end_513
4363 -    .catch Ljava/lang/Throwable; {:try_start_502 .. :try_end_513} :catch_96f
4364 +    :try_end_518
4365 +    .catch Ljava/lang/Throwable; {:try_start_507 .. :try_end_518} :catch_974
4366
4367 -    :goto_513
4368 -    :try_start_513
4369 +    :goto_518
4370 +    :try_start_518
4371      const-string v7, "SystemServer"
4372
4373      const-string v9, "DropBox Service"
4374 @@ -1491,10 +1530,10 @@
4375      invoke-direct {v9, v5, v11}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4376
4377      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4378 -    :try_end_52b
4379 -    .catch Ljava/lang/Throwable; {:try_start_513 .. :try_end_52b} :catch_97b
4380 +    :try_end_530
4381 +    .catch Ljava/lang/Throwable; {:try_start_518 .. :try_end_530} :catch_980
4382
4383 -    :goto_52b
4384 +    :goto_530
4385      invoke-virtual {v5}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4386
4387      move-result-object v7
4388 @@ -1505,38 +1544,38 @@
4389
4390      move-result v7
4391
4392 -    if-eqz v7, :cond_551
4393 +    if-eqz v7, :cond_556
4394
4395 -    :try_start_538
4396 +    :try_start_53d
4397      const-string v7, "SystemServer"
4398
4399      const-string v9, "Wallpaper Service"
4400
4401      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4402
4403 -    if-nez v33, :cond_551
4404 +    if-nez v33, :cond_556
4405
4406      new-instance v134, Lcom/android/server/WallpaperManagerService;
4407
4408      move-object/from16 v0, v134
4409
4410      invoke-direct {v0, v5}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4411 -    :try_end_548
4412 -    .catch Ljava/lang/Throwable; {:try_start_538 .. :try_end_548} :catch_987
4413 +    :try_end_54d
4414 +    .catch Ljava/lang/Throwable; {:try_start_53d .. :try_end_54d} :catch_98c
4415
4416 -    :try_start_548
4417 +    :try_start_54d
4418      const-string v7, "wallpaper"
4419
4420      move-object/from16 v0, v134
4421
4422      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4423 -    :try_end_54f
4424 -    .catch Ljava/lang/Throwable; {:try_start_548 .. :try_end_54f} :catch_af0
4425 +    :try_end_554
4426 +    .catch Ljava/lang/Throwable; {:try_start_54d .. :try_end_554} :catch_af5
4427
4428      move-object/from16 v133, v134
4429
4430 -    :cond_551
4431 -    :goto_551
4432 +    :cond_556
4433 +    :goto_556
4434      const-string v7, "0"
4435
4436      const-string v9, "system_init.startaudioservice"
4437 @@ -1549,9 +1588,9 @@
4438
4439      move-result v7
4440
4441 -    if-nez v7, :cond_570
4442 +    if-nez v7, :cond_575
4443
4444 -    :try_start_55f
4445 +    :try_start_564
4446      const-string v7, "SystemServer"
4447
4448      const-string v9, "Audio Service"
4449 @@ -1565,12 +1604,12 @@
4450      invoke-direct {v9, v5}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4451
4452      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4453 -    :try_end_570
4454 -    .catch Ljava/lang/Throwable; {:try_start_55f .. :try_end_570} :catch_993
4455 +    :try_end_575
4456 +    .catch Ljava/lang/Throwable; {:try_start_564 .. :try_end_575} :catch_998
4457
4458 -    :cond_570
4459 -    :goto_570
4460 -    :try_start_570
4461 +    :cond_575
4462 +    :goto_575
4463 +    :try_start_575
4464      const-string v7, "SystemServer"
4465
4466      const-string v9, "Dock Observer"
4467 @@ -1582,13 +1621,13 @@
4468      move-object/from16 v0, v80
4469
4470      invoke-direct {v0, v5}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;)V
4471 -    :try_end_57e
4472 -    .catch Ljava/lang/Throwable; {:try_start_570 .. :try_end_57e} :catch_99f
4473 +    :try_end_583
4474 +    .catch Ljava/lang/Throwable; {:try_start_575 .. :try_end_583} :catch_9a4
4475
4476      move-object/from16 v79, v80
4477
4478 -    :goto_580
4479 -    :try_start_580
4480 +    :goto_585
4481 +    :try_start_585
4482      const-string v7, "SystemServer"
4483
4484      const-string v9, "Wired Accessory Manager"
4485 @@ -1604,11 +1643,11 @@
4486      move-object/from16 v0, v19
4487
4488      invoke-virtual {v0, v7}, Lcom/android/server/input/InputManagerService;->setWiredAccessoryCallbacks(Lcom/android/server/input/InputManagerService$WiredAccessoryCallbacks;)V
4489 -    :try_end_593
4490 -    .catch Ljava/lang/Throwable; {:try_start_580 .. :try_end_593} :catch_9ab
4491 +    :try_end_598
4492 +    .catch Ljava/lang/Throwable; {:try_start_585 .. :try_end_598} :catch_9b0
4493
4494 -    :goto_593
4495 -    :try_start_593
4496 +    :goto_598
4497 +    :try_start_598
4498      const-string v7, "SystemServer"
4499
4500      const-string v9, "USB Service"
4501 @@ -1620,22 +1659,22 @@
4502      move-object/from16 v0, v129
4503
4504      invoke-direct {v0, v5}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4505 -    :try_end_5a1
4506 -    .catch Ljava/lang/Throwable; {:try_start_593 .. :try_end_5a1} :catch_9b7
4507 +    :try_end_5a6
4508 +    .catch Ljava/lang/Throwable; {:try_start_598 .. :try_end_5a6} :catch_9bc
4509
4510 -    :try_start_5a1
4511 +    :try_start_5a6
4512      const-string v7, "usb"
4513
4514      move-object/from16 v0, v129
4515
4516      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4517 -    :try_end_5a8
4518 -    .catch Ljava/lang/Throwable; {:try_start_5a1 .. :try_end_5a8} :catch_aeb
4519 +    :try_end_5ad
4520 +    .catch Ljava/lang/Throwable; {:try_start_5a6 .. :try_end_5ad} :catch_af0
4521
4522      move-object/from16 v128, v129
4523
4524 -    :goto_5aa
4525 -    :try_start_5aa
4526 +    :goto_5af
4527 +    :try_start_5af
4528      const-string v7, "SystemServer"
4529
4530      const-string v9, "Serial Service"
4531 @@ -1647,22 +1686,22 @@
4532      move-object/from16 v0, v114
4533
4534      invoke-direct {v0, v5}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4535 -    :try_end_5b8
4536 -    .catch Ljava/lang/Throwable; {:try_start_5aa .. :try_end_5b8} :catch_9c3
4537 +    :try_end_5bd
4538 +    .catch Ljava/lang/Throwable; {:try_start_5af .. :try_end_5bd} :catch_9c8
4539
4540 -    :try_start_5b8
4541 +    :try_start_5bd
4542      const-string v7, "serial"
4543
4544      move-object/from16 v0, v114
4545
4546      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4547 -    :try_end_5bf
4548 -    .catch Ljava/lang/Throwable; {:try_start_5b8 .. :try_end_5bf} :catch_ae6
4549 +    :try_end_5c4
4550 +    .catch Ljava/lang/Throwable; {:try_start_5bd .. :try_end_5c4} :catch_aeb
4551
4552      move-object/from16 v113, v114
4553
4554 -    :goto_5c1
4555 -    :try_start_5c1
4556 +    :goto_5c6
4557 +    :try_start_5c6
4558      const-string v7, "SystemServer"
4559
4560      const-string v9, "Twilight Service"
4561 @@ -1674,13 +1713,13 @@
4562      move-object/from16 v0, v124
4563
4564      invoke-direct {v0, v5}, Lcom/android/server/TwilightService;-><init>(Landroid/content/Context;)V
4565 -    :try_end_5cf
4566 -    .catch Ljava/lang/Throwable; {:try_start_5c1 .. :try_end_5cf} :catch_9cf
4567 +    :try_end_5d4
4568 +    .catch Ljava/lang/Throwable; {:try_start_5c6 .. :try_end_5d4} :catch_9d4
4569
4570      move-object/from16 v123, v124
4571
4572 -    :goto_5d1
4573 -    :try_start_5d1
4574 +    :goto_5d6
4575 +    :try_start_5d6
4576      const-string v7, "SystemServer"
4577
4578      const-string v9, "UI Mode Manager Service"
4579 @@ -1694,13 +1733,13 @@
4580      move-object/from16 v1, v123
4581
4582      invoke-direct {v0, v5, v1}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;Lcom/android/server/TwilightService;)V
4583 -    :try_end_5e1
4584 -    .catch Ljava/lang/Throwable; {:try_start_5d1 .. :try_end_5e1} :catch_9db
4585 +    :try_end_5e6
4586 +    .catch Ljava/lang/Throwable; {:try_start_5d6 .. :try_end_5e6} :catch_9e0
4587
4588      move-object/from16 v126, v127
4589
4590 -    :goto_5e3
4591 -    :try_start_5e3
4592 +    :goto_5e8
4593 +    :try_start_5e8
4594      const-string v7, "SystemServer"
4595
4596      const-string v9, "Backup Service"
4597 @@ -1714,11 +1753,11 @@
4598      invoke-direct {v9, v5}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4599
4600      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4601 -    :try_end_5f4
4602 -    .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5f4} :catch_9e7
4603 +    :try_end_5f9
4604 +    .catch Ljava/lang/Throwable; {:try_start_5e8 .. :try_end_5f9} :catch_9ec
4605
4606 -    :goto_5f4
4607 -    :try_start_5f4
4608 +    :goto_5f9
4609 +    :try_start_5f9
4610      const-string v7, "SystemServer"
4611
4612      const-string v9, "AppWidget Service"
4613 @@ -1730,22 +1769,22 @@
4614      move-object/from16 v0, v63
4615
4616      invoke-direct {v0, v5}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4617 -    :try_end_602
4618 -    .catch Ljava/lang/Throwable; {:try_start_5f4 .. :try_end_602} :catch_9f3
4619 +    :try_end_607
4620 +    .catch Ljava/lang/Throwable; {:try_start_5f9 .. :try_end_607} :catch_9f8
4621
4622 -    :try_start_602
4623 +    :try_start_607
4624      const-string v7, "appwidget"
4625
4626      move-object/from16 v0, v63
4627
4628      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4629 -    :try_end_609
4630 -    .catch Ljava/lang/Throwable; {:try_start_602 .. :try_end_609} :catch_ae1
4631 +    :try_end_60e
4632 +    .catch Ljava/lang/Throwable; {:try_start_607 .. :try_end_60e} :catch_ae6
4633
4634      move-object/from16 v62, v63
4635
4636 -    :goto_60b
4637 -    :try_start_60b
4638 +    :goto_610
4639 +    :try_start_610
4640      const-string v7, "SystemServer"
4641
4642      const-string v9, "Recognition Service"
4643 @@ -1757,13 +1796,13 @@
4644      move-object/from16 v0, v112
4645
4646      invoke-direct {v0, v5}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4647 -    :try_end_619
4648 -    .catch Ljava/lang/Throwable; {:try_start_60b .. :try_end_619} :catch_9ff
4649 +    :try_end_61e
4650 +    .catch Ljava/lang/Throwable; {:try_start_610 .. :try_end_61e} :catch_a04
4651
4652      move-object/from16 v111, v112
4653
4654 -    :goto_61b
4655 -    :try_start_61b
4656 +    :goto_620
4657 +    :try_start_620
4658      const-string v7, "SystemServer"
4659
4660      const-string v9, "DiskStats Service"
4661 @@ -1777,11 +1816,11 @@
4662      invoke-direct {v9, v5}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4663
4664      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4665 -    :try_end_62c
4666 -    .catch Ljava/lang/Throwable; {:try_start_61b .. :try_end_62c} :catch_a0b
4667 +    :try_end_631
4668 +    .catch Ljava/lang/Throwable; {:try_start_620 .. :try_end_631} :catch_a10
4669
4670 -    :goto_62c
4671 -    :try_start_62c
4672 +    :goto_631
4673 +    :try_start_631
4674      const-string v7, "SystemServer"
4675
4676      const-string v9, "SamplingProfiler Service"
4677 @@ -1795,11 +1834,11 @@
4678      invoke-direct {v9, v5}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4679
4680      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4681 -    :try_end_63d
4682 -    .catch Ljava/lang/Throwable; {:try_start_62c .. :try_end_63d} :catch_a17
4683 +    :try_end_642
4684 +    .catch Ljava/lang/Throwable; {:try_start_631 .. :try_end_642} :catch_a1c
4685
4686 -    :goto_63d
4687 -    :try_start_63d
4688 +    :goto_642
4689 +    :try_start_642
4690      const-string v7, "SystemServer"
4691
4692      const-string v9, "NetworkTimeUpdateService"
4693 @@ -1811,13 +1850,13 @@
4694      move-object/from16 v0, v104
4695
4696      invoke-direct {v0, v5}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4697 -    :try_end_64b
4698 -    .catch Ljava/lang/Throwable; {:try_start_63d .. :try_end_64b} :catch_a23
4699 +    :try_end_650
4700 +    .catch Ljava/lang/Throwable; {:try_start_642 .. :try_end_650} :catch_a28
4701
4702      move-object/from16 v103, v104
4703
4704 -    :goto_64d
4705 -    :try_start_64d
4706 +    :goto_652
4707 +    :try_start_652
4708      const-string v7, "SystemServer"
4709
4710      const-string v9, "CommonTimeManagementService"
4711 @@ -1829,22 +1868,22 @@
4712      move-object/from16 v0, v68
4713
4714      invoke-direct {v0, v5}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4715 -    :try_end_65b
4716 -    .catch Ljava/lang/Throwable; {:try_start_64d .. :try_end_65b} :catch_a2f
4717 +    :try_end_660
4718 +    .catch Ljava/lang/Throwable; {:try_start_652 .. :try_end_660} :catch_a34
4719
4720 -    :try_start_65b
4721 +    :try_start_660
4722      const-string v7, "commontime_management"
4723
4724      move-object/from16 v0, v68
4725
4726      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4727 -    :try_end_662
4728 -    .catch Ljava/lang/Throwable; {:try_start_65b .. :try_end_662} :catch_adc
4729 +    :try_end_667
4730 +    .catch Ljava/lang/Throwable; {:try_start_660 .. :try_end_667} :catch_ae1
4731
4732      move-object/from16 v67, v68
4733
4734 -    :goto_664
4735 -    :try_start_664
4736 +    :goto_669
4737 +    :try_start_669
4738      const-string v7, "SystemServer"
4739
4740      const-string v9, "CertBlacklister"
4741 @@ -1854,10 +1893,10 @@
4742      new-instance v7, Lcom/android/server/CertBlacklister;
4743
4744      invoke-direct {v7, v5}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4745 -    :try_end_670
4746 -    .catch Ljava/lang/Throwable; {:try_start_664 .. :try_end_670} :catch_a3b
4747 +    :try_end_675
4748 +    .catch Ljava/lang/Throwable; {:try_start_669 .. :try_end_675} :catch_a40
4749
4750 -    :goto_670
4751 +    :goto_675
4752      invoke-virtual {v5}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4753
4754      move-result-object v7
4755 @@ -1868,9 +1907,9 @@
4756
4757      move-result v7
4758
4759 -    if-eqz v7, :cond_696
4760 +    if-eqz v7, :cond_69b
4761
4762 -    :try_start_67d
4763 +    :try_start_682
4764      const-string v7, "SystemServer"
4765
4766      const-string v9, "Dreams Service"
4767 @@ -1884,23 +1923,23 @@
4768      move-object/from16 v1, v21
4769
4770      invoke-direct {v0, v5, v1}, Lcom/android/server/dreams/DreamManagerService;-><init>(Landroid/content/Context;Landroid/os/Handler;)V
4771 -    :try_end_68d
4772 -    .catch Ljava/lang/Throwable; {:try_start_67d .. :try_end_68d} :catch_a47
4773 +    :try_end_692
4774 +    .catch Ljava/lang/Throwable; {:try_start_682 .. :try_end_692} :catch_a4c
4775
4776 -    :try_start_68d
4777 +    :try_start_692
4778      const-string v7, "dreams"
4779
4780      move-object/from16 v0, v82
4781
4782      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4783 -    :try_end_694
4784 -    .catch Ljava/lang/Throwable; {:try_start_68d .. :try_end_694} :catch_ad7
4785 +    :try_end_699
4786 +    .catch Ljava/lang/Throwable; {:try_start_692 .. :try_end_699} :catch_adc
4787
4788      move-object/from16 v81, v82
4789
4790 -    :cond_696
4791 -    :goto_696
4792 -    :try_start_696
4793 +    :cond_69b
4794 +    :goto_69b
4795 +    :try_start_69b
4796      const-string v7, "SystemServer"
4797
4798      const-string v9, "AssetRedirectionManager Service"
4799 @@ -1914,11 +1953,11 @@
4800      invoke-direct {v9, v5}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
4801
4802      invoke-static {v7, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4803 -    :try_end_6a7
4804 -    .catch Ljava/lang/Throwable; {:try_start_696 .. :try_end_6a7} :catch_a53
4805 +    :try_end_6ac
4806 +    .catch Ljava/lang/Throwable; {:try_start_69b .. :try_end_6ac} :catch_a58
4807
4808 -    :goto_6a7
4809 -    :try_start_6a7
4810 +    :goto_6ac
4811 +    :try_start_6ac
4812      const-string v7, "SystemServer"
4813
4814      const-string v9, "IdleMaintenanceService"
4815 @@ -1928,15 +1967,15 @@
4816      new-instance v7, Lcom/android/server/IdleMaintenanceService;
4817
4818      invoke-direct {v7, v5, v8}, Lcom/android/server/IdleMaintenanceService;-><init>(Landroid/content/Context;Lcom/android/server/BatteryService;)V
4819 -    :try_end_6b3
4820 -    .catch Ljava/lang/Throwable; {:try_start_6a7 .. :try_end_6b3} :catch_a5f
4821 +    :try_end_6b8
4822 +    .catch Ljava/lang/Throwable; {:try_start_6ac .. :try_end_6b8} :catch_a64
4823
4824 -    :goto_6b3
4825 +    :goto_6b8
4826      invoke-virtual/range {v139 .. v139}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
4827
4828      move-result v47
4829
4830 -    if-eqz v47, :cond_a6b
4831 +    if-eqz v47, :cond_a70
4832
4833      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4834
4835 @@ -1954,44 +1993,44 @@
4836
4837      invoke-virtual {v7}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4838
4839 -    :goto_6ca
4840 -    :try_start_6ca
4841 +    :goto_6cf
4842 +    :try_start_6cf
4843      invoke-virtual/range {v130 .. v130}, Lcom/android/server/VibratorService;->systemReady()V
4844 -    :try_end_6cd
4845 -    .catch Ljava/lang/Throwable; {:try_start_6ca .. :try_end_6cd} :catch_a74
4846 -
4847 -    :goto_6cd
4848 -    :try_start_6cd
4849 -    invoke-virtual/range {v96 .. v96}, Lcom/android/server/LockSettingsService;->systemReady()V
4850 -    :try_end_6d0
4851 -    .catch Ljava/lang/Throwable; {:try_start_6cd .. :try_end_6d0} :catch_a80
4852 -
4853 -    :goto_6d0
4854 -    if-eqz v76, :cond_6d5
4855 +    :try_end_6d2
4856 +    .catch Ljava/lang/Throwable; {:try_start_6cf .. :try_end_6d2} :catch_a79
4857
4858 +    :goto_6d2
4859      :try_start_6d2
4860 -    invoke-virtual/range {v76 .. v76}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4861 +    invoke-virtual/range {v96 .. v96}, Lcom/android/server/LockSettingsService;->systemReady()V
4862      :try_end_6d5
4863 -    .catch Ljava/lang/Throwable; {:try_start_6d2 .. :try_end_6d5} :catch_a8c
4864 +    .catch Ljava/lang/Throwable; {:try_start_6d2 .. :try_end_6d5} :catch_a85
4865
4866 -    :cond_6d5
4867      :goto_6d5
4868 -    if-eqz v105, :cond_6da
4869 +    if-eqz v76, :cond_6da
4870
4871      :try_start_6d7
4872 -    invoke-virtual/range {v105 .. v105}, Lcom/android/server/NotificationManagerService;->systemReady()V
4873 +    invoke-virtual/range {v76 .. v76}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4874      :try_end_6da
4875 -    .catch Ljava/lang/Throwable; {:try_start_6d7 .. :try_end_6da} :catch_a98
4876 +    .catch Ljava/lang/Throwable; {:try_start_6d7 .. :try_end_6da} :catch_a91
4877
4878      :cond_6da
4879      :goto_6da
4880 -    :try_start_6da
4881 +    if-eqz v105, :cond_6df
4882 +
4883 +    :try_start_6dc
4884 +    invoke-virtual/range {v105 .. v105}, Lcom/android/server/NotificationManagerService;->systemReady()V
4885 +    :try_end_6df
4886 +    .catch Ljava/lang/Throwable; {:try_start_6dc .. :try_end_6df} :catch_a9d
4887 +
4888 +    :cond_6df
4889 +    :goto_6df
4890 +    :try_start_6df
4891      invoke-virtual/range {v139 .. v139}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4892 -    :try_end_6dd
4893 -    .catch Ljava/lang/Throwable; {:try_start_6da .. :try_end_6dd} :catch_aa4
4894 +    :try_end_6e2
4895 +    .catch Ljava/lang/Throwable; {:try_start_6df .. :try_end_6e2} :catch_aa9
4896
4897 -    :goto_6dd
4898 -    if-eqz v47, :cond_6e6
4899 +    :goto_6e2
4900 +    if-eqz v47, :cond_6eb
4901
4902      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4903
4904 @@ -1999,7 +2038,7 @@
4905
4906      invoke-virtual {v7}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4907
4908 -    :cond_6e6
4909 +    :cond_6eb
4910      invoke-virtual/range {v139 .. v139}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4911
4912      move-result-object v69
4913 @@ -2034,32 +2073,32 @@
4914
4915      invoke-virtual {v7, v0, v1}, Landroid/content/res/Resources;->updateConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;)V
4916
4917 -    :try_start_70b
4918 +    :try_start_710
4919      move-object/from16 v0, v123
4920
4921      move-object/from16 v1, v81
4922
4923      invoke-virtual {v4, v0, v1}, Lcom/android/server/power/PowerManagerService;->systemReady(Lcom/android/server/TwilightService;Lcom/android/server/dreams/DreamManagerService;)V
4924 -    :try_end_712
4925 -    .catch Ljava/lang/Throwable; {:try_start_70b .. :try_end_712} :catch_ab0
4926 +    :try_end_717
4927 +    .catch Ljava/lang/Throwable; {:try_start_710 .. :try_end_717} :catch_ab5
4928
4929 -    :goto_712
4930 -    :try_start_712
4931 +    :goto_717
4932 +    :try_start_717
4933      invoke-interface/range {v107 .. v107}, Landroid/content/pm/IPackageManager;->systemReady()V
4934 -    :try_end_715
4935 -    .catch Ljava/lang/Throwable; {:try_start_712 .. :try_end_715} :catch_abc
4936 +    :try_end_71a
4937 +    .catch Ljava/lang/Throwable; {:try_start_717 .. :try_end_71a} :catch_ac1
4938
4939 -    :goto_715
4940 -    :try_start_715
4941 +    :goto_71a
4942 +    :try_start_71a
4943      move/from16 v0, v47
4944
4945      move/from16 v1, v24
4946
4947      invoke-virtual {v10, v0, v1}, Lcom/android/server/display/DisplayManagerService;->systemReady(ZZ)V
4948 -    :try_end_71c
4949 -    .catch Ljava/lang/Throwable; {:try_start_715 .. :try_end_71c} :catch_ac8
4950 +    :try_end_721
4951 +    .catch Ljava/lang/Throwable; {:try_start_71a .. :try_end_721} :catch_acd
4952
4953 -    :goto_71c
4954 +    :goto_721
4955      new-instance v86, Landroid/content/IntentFilter;
4956
4957      invoke-direct/range {v86 .. v86}, Landroid/content/IntentFilter;-><init>()V
4958 @@ -2174,7 +2213,7 @@
4959
4960      move-result v7
4961
4962 -    if-eqz v7, :cond_7a2
4963 +    if-eqz v7, :cond_7a7
4964
4965      const-string v7, "SystemServer"
4966
4967 @@ -2182,7 +2221,7 @@
4968
4969      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4970
4971 -    :cond_7a2
4972 +    :cond_7a7
4973      invoke-static {}, Landroid/os/Looper;->loop()V
4974
4975      const-string v7, "SystemServer"
4976 @@ -2193,25 +2232,25 @@
4977
4978      return-void
4979
4980 -    :cond_7ad
4981 +    :cond_7b2
4982      const/16 v110, 0x0
4983
4984      goto/16 :goto_35
4985
4986 -    :cond_7b1
4987 +    :cond_7b6
4988      const/16 v109, 0x0
4989
4990      goto/16 :goto_47
4991
4992 -    :cond_7b5
4993 +    :cond_7ba
4994      invoke-static/range {v85 .. v85}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4995
4996      move-result v84
4997
4998      goto/16 :goto_60
4999
5000 -    :cond_7bb
5001 -    :try_start_7bb
5002 +    :cond_7c0
5003 +    :try_start_7c0
5004      const-string v7, "1"
5005
5006      move-object/from16 v0, v75
5007 @@ -2232,15 +2271,15 @@
5008
5009      goto/16 :goto_18f
5010
5011 -    :cond_7d0
5012 +    :cond_7d5
5013      const/4 v7, 0x0
5014
5015      goto/16 :goto_192
5016
5017 -    :catch_7d3
5018 +    :catch_7d8
5019      move-exception v83
5020
5021 -    :goto_7d4
5022 +    :goto_7d9
5023      const-string v7, "SystemServer"
5024
5025      const-string v9, "Failure starting Account Manager"
5026 @@ -2248,12 +2287,12 @@
5027      move-object/from16 v0, v83
5028
5029      invoke-static {v7, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5030 -    :try_end_7dd
5031 -    .catch Ljava/lang/RuntimeException; {:try_start_7bb .. :try_end_7dd} :catch_7df
5032 +    :try_end_7e2
5033 +    .catch Ljava/lang/RuntimeException; {:try_start_7c0 .. :try_end_7e2} :catch_7e4
5034
5035      goto/16 :goto_1e3
5036
5037 -    :catch_7df
5038 +    :catch_7e4
5039      move-exception v83
5040
5041      move-object/from16 v119, v120
5042 @@ -2268,7 +2307,7 @@
5043
5044      move-object/from16 v91, v92
5045
5046 -    :goto_7ec
5047 +    :goto_7f1
5048      const-string v7, "System"
5049
5050      const-string v9, "******************************************"
5051 @@ -2283,40 +2322,40 @@
5052
5053      invoke-static {v7, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5054
5055 -    goto/16 :goto_2d5
5056 +    goto/16 :goto_2da
5057
5058 -    :cond_7fe
5059 +    :cond_803
5060      const/4 v7, 0x0
5061
5062      goto/16 :goto_1f0
5063
5064 -    :cond_801
5065 +    :cond_806
5066      const/16 v22, 0x0
5067
5068 -    goto/16 :goto_27f
5069 +    goto/16 :goto_284
5070
5071 -    :cond_805
5072 +    :cond_80a
5073      const/16 v23, 0x0
5074
5075 -    goto/16 :goto_283
5076 +    goto/16 :goto_288
5077
5078 -    :cond_809
5079 +    :cond_80e
5080      const/4 v7, 0x1
5081
5082      move/from16 v0, v84
5083
5084 -    if-ne v0, v7, :cond_81f
5085 +    if-ne v0, v7, :cond_824
5086
5087 -    :try_start_80e
5088 +    :try_start_813
5089      const-string v7, "SystemServer"
5090
5091      const-string v9, "No Bluetooth Service (factory test)"
5092
5093      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
5094
5095 -    goto/16 :goto_2cf
5096 +    goto/16 :goto_2d4
5097
5098 -    :catch_817
5099 +    :catch_81c
5100      move-exception v83
5101
5102      move-object/from16 v119, v120
5103 @@ -2325,9 +2364,9 @@
5104
5105      move-object/from16 v91, v92
5106
5107 -    goto :goto_7ec
5108 +    goto :goto_7f1
5109
5110 -    :cond_81f
5111 +    :cond_824
5112      invoke-virtual {v5}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
5113
5114      move-result-object v7
5115 @@ -2338,7 +2377,7 @@
5116
5117      move-result v7
5118
5119 -    if-nez v7, :cond_834
5120 +    if-nez v7, :cond_839
5121
5122      const-string v7, "SystemServer"
5123
5124 @@ -2346,9 +2385,9 @@
5125
5126      invoke-static {v7, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
5127
5128 -    goto/16 :goto_2cf
5129 +    goto/16 :goto_2d4
5130
5131 -    :cond_834
5132 +    :cond_839
5133      const-string v7, "SystemServer"
5134
5135      const-string v9, "Bluetooth Manager Service"
5136 @@ -2360,26 +2399,26 @@
5137      move-object/from16 v0, v66
5138
5139      invoke-direct {v0, v5}, Lcom/android/server/BluetoothManagerService;-><init>(Landroid/content/Context;)V
5140 -    :try_end_842
5141 -    .catch Ljava/lang/RuntimeException; {:try_start_80e .. :try_end_842} :catch_817
5142 +    :try_end_847
5143 +    .catch Ljava/lang/RuntimeException; {:try_start_813 .. :try_end_847} :catch_81c
5144
5145 -    :try_start_842
5146 +    :try_start_847
5147      const-string v7, "bluetooth_manager"
5148
5149      move-object/from16 v0, v66
5150
5151      invoke-static {v7, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
5152 -    :try_end_849
5153 -    .catch Ljava/lang/RuntimeException; {:try_start_842 .. :try_end_849} :catch_bb9
5154 +    :try_end_84e
5155 +    .catch Ljava/lang/RuntimeException; {:try_start_847 .. :try_end_84e} :catch_bbe
5156
5157      move-object/from16 v65, v66
5158
5159 -    goto/16 :goto_2cf
5160 +    goto/16 :goto_2d4
5161
5162 -    :catch_84d
5163 +    :catch_852
5164      move-exception v83
5165
5166 -    :goto_84e
5167 +    :goto_853
5168      const-string v7, "starting Input Manager Service"
5169
5170      move-object/from16 v0, p0
5171 @@ -2388,9 +2427,9 @@
5172
5173      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5174
5175 -    goto/16 :goto_309
5176 +    goto/16 :goto_30e
5177
5178 -    :catch_859
5179 +    :catch_85e
5180      move-exception v83
5181
5182      const-string v7, "starting Accessibility Manager"
5183 @@ -2401,9 +2440,9 @@
5184
5185      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5186
5187 -    goto/16 :goto_31a
5188 +    goto/16 :goto_31f
5189
5190 -    :catch_865
5191 +    :catch_86a
5192      move-exception v83
5193
5194      const-string v7, "making display ready"
5195 @@ -2414,9 +2453,9 @@
5196
5197      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5198
5199 -    goto/16 :goto_31d
5200 +    goto/16 :goto_322
5201
5202 -    :catch_871
5203 +    :catch_876
5204      move-exception v83
5205
5206      const-string v7, "performing boot dexopt"
5207 @@ -2427,12 +2466,12 @@
5208
5209      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5210
5211 -    goto/16 :goto_320
5212 +    goto/16 :goto_325
5213
5214 -    :catch_87d
5215 +    :catch_882
5216      move-exception v83
5217
5218 -    :goto_87e
5219 +    :goto_883
5220      const-string v7, "starting Mount Service"
5221
5222      move-object/from16 v0, p0
5223 @@ -2441,12 +2480,12 @@
5224
5225      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5226
5227 -    goto/16 :goto_35d
5228 +    goto/16 :goto_362
5229
5230 -    :catch_889
5231 +    :catch_88e
5232      move-exception v83
5233
5234 -    :goto_88a
5235 +    :goto_88f
5236      const-string v7, "starting LockSettingsService service"
5237
5238      move-object/from16 v0, p0
5239 @@ -2455,12 +2494,12 @@
5240
5241      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5242
5243 -    goto/16 :goto_374
5244 +    goto/16 :goto_379
5245
5246 -    :catch_895
5247 +    :catch_89a
5248      move-exception v83
5249
5250 -    :goto_896
5251 +    :goto_89b
5252      const-string v7, "starting DevicePolicyService"
5253
5254      move-object/from16 v0, p0
5255 @@ -2469,12 +2508,12 @@
5256
5257      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5258
5259 -    goto/16 :goto_38b
5260 +    goto/16 :goto_390
5261
5262 -    :catch_8a1
5263 +    :catch_8a6
5264      move-exception v83
5265
5266 -    :goto_8a2
5267 +    :goto_8a7
5268      const-string v7, "starting StatusBarManagerService"
5269
5270      move-object/from16 v0, p0
5271 @@ -2483,9 +2522,9 @@
5272
5273      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5274
5275 -    goto/16 :goto_3a4
5276 +    goto/16 :goto_3a9
5277
5278 -    :catch_8ad
5279 +    :catch_8b2
5280      move-exception v83
5281
5282      const-string v7, "starting Clipboard Service"
5283 @@ -2496,9 +2535,9 @@
5284
5285      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5286
5287 -    goto/16 :goto_3b5
5288 +    goto/16 :goto_3ba
5289
5290 -    :catch_8b9
5291 +    :catch_8be
5292      move-exception v83
5293
5294      const-string v7, "starting NetworkManagement Service"
5295 @@ -2509,12 +2548,12 @@
5296
5297      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5298
5299 -    goto/16 :goto_3c7
5300 +    goto/16 :goto_3cc
5301
5302 -    :catch_8c5
5303 +    :catch_8ca
5304      move-exception v83
5305
5306 -    :goto_8c6
5307 +    :goto_8cb
5308      const-string v7, "starting Text Service Manager Service"
5309
5310      move-object/from16 v0, p0
5311 @@ -2523,12 +2562,12 @@
5312
5313      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5314
5315 -    goto/16 :goto_3de
5316 +    goto/16 :goto_3e3
5317
5318 -    :catch_8d1
5319 +    :catch_8d6
5320      move-exception v83
5321
5322 -    :goto_8d2
5323 +    :goto_8d7
5324      const-string v7, "starting NetworkStats Service"
5325
5326      move-object/from16 v0, p0
5327 @@ -2537,14 +2576,14 @@
5328
5329      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5330
5331 -    goto/16 :goto_3f7
5332 +    goto/16 :goto_3fc
5333
5334 -    :catch_8dd
5335 +    :catch_8e2
5336      move-exception v83
5337
5338      move-object/from16 v25, v101
5339
5340 -    :goto_8e0
5341 +    :goto_8e5
5342      const-string v7, "starting NetworkPolicy Service"
5343
5344      move-object/from16 v0, p0
5345 @@ -2553,12 +2592,12 @@
5346
5347      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5348
5349 -    goto/16 :goto_412
5350 +    goto/16 :goto_417
5351
5352 -    :catch_8eb
5353 +    :catch_8f0
5354      move-exception v83
5355
5356 -    :goto_8ec
5357 +    :goto_8f1
5358      const-string v7, "starting Wi-Fi P2pService"
5359
5360      move-object/from16 v0, p0
5361 @@ -2567,12 +2606,12 @@
5362
5363      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5364
5365 -    goto/16 :goto_429
5366 +    goto/16 :goto_42e
5367
5368 -    :catch_8f7
5369 +    :catch_8fc
5370      move-exception v83
5371
5372 -    :goto_8f8
5373 +    :goto_8fd
5374      const-string v7, "starting Wi-Fi Service"
5375
5376      move-object/from16 v0, p0
5377 @@ -2581,12 +2620,12 @@
5378
5379      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5380
5381 -    goto/16 :goto_440
5382 +    goto/16 :goto_445
5383
5384 -    :catch_903
5385 +    :catch_908
5386      move-exception v83
5387
5388 -    :goto_904
5389 +    :goto_909
5390      const-string v7, "starting Connectivity Service"
5391
5392      move-object/from16 v0, p0
5393 @@ -2595,9 +2634,9 @@
5394
5395      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5396
5397 -    goto/16 :goto_471
5398 +    goto/16 :goto_476
5399
5400 -    :catch_90f
5401 +    :catch_914
5402      move-exception v83
5403
5404      const-string v7, "starting Service Discovery Service"
5405 @@ -2608,9 +2647,9 @@
5406
5407      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5408
5409 -    goto/16 :goto_483
5410 +    goto/16 :goto_488
5411
5412 -    :catch_91b
5413 +    :catch_920
5414      move-exception v83
5415
5416      const-string v7, "starting UpdateLockService"
5417 @@ -2621,9 +2660,9 @@
5418
5419      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5420
5421 -    goto/16 :goto_494
5422 +    goto/16 :goto_499
5423
5424 -    :catch_927
5425 +    :catch_92c
5426      move-exception v83
5427
5428      const-string v7, "making Account Manager Service ready"
5429 @@ -2634,9 +2673,9 @@
5430
5431      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5432
5433 -    goto/16 :goto_49e
5434 +    goto/16 :goto_4a3
5435
5436 -    :catch_933
5437 +    :catch_938
5438      move-exception v83
5439
5440      const-string v7, "making Content Service ready"
5441 @@ -2647,12 +2686,12 @@
5442
5443      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5444
5445 -    goto/16 :goto_4a3
5446 +    goto/16 :goto_4a8
5447
5448 -    :catch_93f
5449 +    :catch_944
5450      move-exception v83
5451
5452 -    :goto_940
5453 +    :goto_945
5454      const-string v7, "starting Notification Manager"
5455
5456      move-object/from16 v0, p0
5457 @@ -2661,9 +2700,9 @@
5458
5459      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5460
5461 -    goto/16 :goto_4c3
5462 +    goto/16 :goto_4c8
5463
5464 -    :catch_94b
5465 +    :catch_950
5466      move-exception v83
5467
5468      const-string v7, "starting DeviceStorageMonitor service"
5469 @@ -2674,12 +2713,12 @@
5470
5471      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5472
5473 -    goto/16 :goto_4d4
5474 +    goto/16 :goto_4d9
5475
5476 -    :catch_957
5477 +    :catch_95c
5478      move-exception v83
5479
5480 -    :goto_958
5481 +    :goto_95d
5482      const-string v7, "starting Location Manager"
5483
5484      move-object/from16 v0, p0
5485 @@ -2688,12 +2727,12 @@
5486
5487      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5488
5489 -    goto/16 :goto_4eb
5490 +    goto/16 :goto_4f0
5491
5492 -    :catch_963
5493 +    :catch_968
5494      move-exception v83
5495
5496 -    :goto_964
5497 +    :goto_969
5498      const-string v7, "starting Country Detector"
5499
5500      move-object/from16 v0, p0
5501 @@ -2702,9 +2741,9 @@
5502
5503      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5504
5505 -    goto/16 :goto_502
5506 +    goto/16 :goto_507
5507
5508 -    :catch_96f
5509 +    :catch_974
5510      move-exception v83
5511
5512      const-string v7, "starting Search Service"
5513 @@ -2715,9 +2754,9 @@
5514
5515      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5516
5517 -    goto/16 :goto_513
5518 +    goto/16 :goto_518
5519
5520 -    :catch_97b
5521 +    :catch_980
5522      move-exception v83
5523
5524      const-string v7, "starting DropBoxManagerService"
5525 @@ -2728,12 +2767,12 @@
5526
5527      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5528
5529 -    goto/16 :goto_52b
5530 +    goto/16 :goto_530
5531
5532 -    :catch_987
5533 +    :catch_98c
5534      move-exception v83
5535
5536 -    :goto_988
5537 +    :goto_98d
5538      const-string v7, "starting Wallpaper Service"
5539
5540      move-object/from16 v0, p0
5541 @@ -2742,9 +2781,9 @@
5542
5543      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5544
5545 -    goto/16 :goto_551
5546 +    goto/16 :goto_556
5547
5548 -    :catch_993
5549 +    :catch_998
5550      move-exception v83
5551
5552      const-string v7, "starting Audio Service"
5553 @@ -2755,9 +2794,9 @@
5554
5555      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5556
5557 -    goto/16 :goto_570
5558 +    goto/16 :goto_575
5559
5560 -    :catch_99f
5561 +    :catch_9a4
5562      move-exception v83
5563
5564      const-string v7, "starting DockObserver"
5565 @@ -2768,9 +2807,9 @@
5566
5567      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5568
5569 -    goto/16 :goto_580
5570 +    goto/16 :goto_585
5571
5572 -    :catch_9ab
5573 +    :catch_9b0
5574      move-exception v83
5575
5576      const-string v7, "starting WiredAccessoryManager"
5577 @@ -2781,12 +2820,12 @@
5578
5579      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5580
5581 -    goto/16 :goto_593
5582 +    goto/16 :goto_598
5583
5584 -    :catch_9b7
5585 +    :catch_9bc
5586      move-exception v83
5587
5588 -    :goto_9b8
5589 +    :goto_9bd
5590      const-string v7, "starting UsbService"
5591
5592      move-object/from16 v0, p0
5593 @@ -2795,12 +2834,12 @@
5594
5595      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5596
5597 -    goto/16 :goto_5aa
5598 +    goto/16 :goto_5af
5599
5600 -    :catch_9c3
5601 +    :catch_9c8
5602      move-exception v83
5603
5604 -    :goto_9c4
5605 +    :goto_9c9
5606      const-string v7, "SystemServer"
5607
5608      const-string v9, "Failure starting SerialService"
5609 @@ -2809,9 +2848,9 @@
5610
5611      invoke-static {v7, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5612
5613 -    goto/16 :goto_5c1
5614 +    goto/16 :goto_5c6
5615
5616 -    :catch_9cf
5617 +    :catch_9d4
5618      move-exception v83
5619
5620      const-string v7, "starting TwilightService"
5621 @@ -2822,9 +2861,9 @@
5622
5623      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5624
5625 -    goto/16 :goto_5d1
5626 +    goto/16 :goto_5d6
5627
5628 -    :catch_9db
5629 +    :catch_9e0
5630      move-exception v83
5631
5632      const-string v7, "starting UiModeManagerService"
5633 @@ -2835,9 +2874,9 @@
5634
5635      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5636
5637 -    goto/16 :goto_5e3
5638 +    goto/16 :goto_5e8
5639
5640 -    :catch_9e7
5641 +    :catch_9ec
5642      move-exception v83
5643
5644      const-string v7, "SystemServer"
5645 @@ -2848,12 +2887,12 @@
5646
5647      invoke-static {v7, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5648
5649 -    goto/16 :goto_5f4
5650 +    goto/16 :goto_5f9
5651
5652 -    :catch_9f3
5653 +    :catch_9f8
5654      move-exception v83
5655
5656 -    :goto_9f4
5657 +    :goto_9f9
5658      const-string v7, "starting AppWidget Service"
5659
5660      move-object/from16 v0, p0
5661 @@ -2862,9 +2901,9 @@
5662
5663      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5664
5665 -    goto/16 :goto_60b
5666 +    goto/16 :goto_610
5667
5668 -    :catch_9ff
5669 +    :catch_a04
5670      move-exception v83
5671
5672      const-string v7, "starting Recognition Service"
5673 @@ -2875,9 +2914,9 @@
5674
5675      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5676
5677 -    goto/16 :goto_61b
5678 +    goto/16 :goto_620
5679
5680 -    :catch_a0b
5681 +    :catch_a10
5682      move-exception v83
5683
5684      const-string v7, "starting DiskStats Service"
5685 @@ -2888,9 +2927,9 @@
5686
5687      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5688
5689 -    goto/16 :goto_62c
5690 +    goto/16 :goto_631
5691
5692 -    :catch_a17
5693 +    :catch_a1c
5694      move-exception v83
5695
5696      const-string v7, "starting SamplingProfiler Service"
5697 @@ -2901,9 +2940,9 @@
5698
5699      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5700
5701 -    goto/16 :goto_63d
5702 +    goto/16 :goto_642
5703
5704 -    :catch_a23
5705 +    :catch_a28
5706      move-exception v83
5707
5708      const-string v7, "starting NetworkTimeUpdate service"
5709 @@ -2914,12 +2953,12 @@
5710
5711      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5712
5713 -    goto/16 :goto_64d
5714 +    goto/16 :goto_652
5715
5716 -    :catch_a2f
5717 +    :catch_a34
5718      move-exception v83
5719
5720 -    :goto_a30
5721 +    :goto_a35
5722      const-string v7, "starting CommonTimeManagementService service"
5723
5724      move-object/from16 v0, p0
5725 @@ -2928,9 +2967,9 @@
5726
5727      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5728
5729 -    goto/16 :goto_664
5730 +    goto/16 :goto_669
5731
5732 -    :catch_a3b
5733 +    :catch_a40
5734      move-exception v83
5735
5736      const-string v7, "starting CertBlacklister"
5737 @@ -2941,12 +2980,12 @@
5738
5739      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5740
5741 -    goto/16 :goto_670
5742 +    goto/16 :goto_675
5743
5744 -    :catch_a47
5745 +    :catch_a4c
5746      move-exception v83
5747
5748 -    :goto_a48
5749 +    :goto_a4d
5750      const-string v7, "starting DreamManagerService"
5751
5752      move-object/from16 v0, p0
5753 @@ -2955,9 +2994,9 @@
5754
5755      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5756
5757 -    goto/16 :goto_696
5758 +    goto/16 :goto_69b
5759
5760 -    :catch_a53
5761 +    :catch_a58
5762      move-exception v83
5763
5764      const-string v7, "SystemServer"
5765 @@ -2968,9 +3007,9 @@
5766
5767      invoke-static {v7, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5768
5769 -    goto/16 :goto_6a7
5770 +    goto/16 :goto_6ac
5771
5772 -    :catch_a5f
5773 +    :catch_a64
5774      move-exception v83
5775
5776      const-string v7, "starting IdleMaintenanceService"
5777 @@ -2981,18 +3020,18 @@
5778
5779      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5780
5781 -    goto/16 :goto_6b3
5782 +    goto/16 :goto_6b8
5783
5784 -    :cond_a6b
5785 +    :cond_a70
5786      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5787
5788      move-result-object v7
5789
5790      invoke-virtual {v7}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5791
5792 -    goto/16 :goto_6ca
5793 +    goto/16 :goto_6cf
5794
5795 -    :catch_a74
5796 +    :catch_a79
5797      move-exception v83
5798
5799      const-string v7, "making Vibrator Service ready"
5800 @@ -3003,9 +3042,9 @@
5801
5802      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5803
5804 -    goto/16 :goto_6cd
5805 +    goto/16 :goto_6d2
5806
5807 -    :catch_a80
5808 +    :catch_a85
5809      move-exception v83
5810
5811      const-string v7, "making Lock Settings Service ready"
5812 @@ -3016,9 +3055,9 @@
5813
5814      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5815
5816 -    goto/16 :goto_6d0
5817 +    goto/16 :goto_6d5
5818
5819 -    :catch_a8c
5820 +    :catch_a91
5821      move-exception v83
5822
5823      const-string v7, "making Device Policy Service ready"
5824 @@ -3029,9 +3068,9 @@
5825
5826      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5827
5828 -    goto/16 :goto_6d5
5829 +    goto/16 :goto_6da
5830
5831 -    :catch_a98
5832 +    :catch_a9d
5833      move-exception v83
5834
5835      const-string v7, "making Notification Service ready"
5836 @@ -3042,9 +3081,9 @@
5837
5838      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5839
5840 -    goto/16 :goto_6da
5841 +    goto/16 :goto_6df
5842
5843 -    :catch_aa4
5844 +    :catch_aa9
5845      move-exception v83
5846
5847      const-string v7, "making Window Manager Service ready"
5848 @@ -3055,9 +3094,9 @@
5849
5850      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5851
5852 -    goto/16 :goto_6dd
5853 +    goto/16 :goto_6e2
5854
5855 -    :catch_ab0
5856 +    :catch_ab5
5857      move-exception v83
5858
5859      const-string v7, "making Power Manager Service ready"
5860 @@ -3068,9 +3107,9 @@
5861
5862      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5863
5864 -    goto/16 :goto_712
5865 +    goto/16 :goto_717
5866
5867 -    :catch_abc
5868 +    :catch_ac1
5869      move-exception v83
5870
5871      const-string v7, "making Package Manager Service ready"
5872 @@ -3081,9 +3120,9 @@
5873
5874      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5875
5876 -    goto/16 :goto_715
5877 +    goto/16 :goto_71a
5878
5879 -    :catch_ac8
5880 +    :catch_acd
5881      move-exception v83
5882
5883      const-string v7, "making Display Manager Service ready"
5884 @@ -3094,157 +3133,157 @@
5885
5886      invoke-virtual {v0, v7, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5887
5888 -    goto/16 :goto_71c
5889 +    goto/16 :goto_721
5890
5891 -    :catch_ad4
5892 +    :catch_ad9
5893      move-exception v7
5894
5895      goto/16 :goto_1a0
5896
5897 -    :catch_ad7
5898 +    :catch_adc
5899      move-exception v83
5900
5901      move-object/from16 v81, v82
5902
5903 -    goto/16 :goto_a48
5904 +    goto/16 :goto_a4d
5905
5906 -    :catch_adc
5907 +    :catch_ae1
5908      move-exception v83
5909
5910      move-object/from16 v67, v68
5911
5912 -    goto/16 :goto_a30
5913 +    goto/16 :goto_a35
5914
5915 -    :catch_ae1
5916 +    :catch_ae6
5917      move-exception v83
5918
5919      move-object/from16 v62, v63
5920
5921 -    goto/16 :goto_9f4
5922 +    goto/16 :goto_9f9
5923
5924 -    :catch_ae6
5925 +    :catch_aeb
5926      move-exception v83
5927
5928      move-object/from16 v113, v114
5929
5930 -    goto/16 :goto_9c4
5931 +    goto/16 :goto_9c9
5932
5933 -    :catch_aeb
5934 +    :catch_af0
5935      move-exception v83
5936
5937      move-object/from16 v128, v129
5938
5939 -    goto/16 :goto_9b8
5940 +    goto/16 :goto_9bd
5941
5942 -    :catch_af0
5943 +    :catch_af5
5944      move-exception v83
5945
5946      move-object/from16 v133, v134
5947
5948 -    goto/16 :goto_988
5949 +    goto/16 :goto_98d
5950
5951 -    :catch_af5
5952 +    :catch_afa
5953      move-exception v83
5954
5955      move-object/from16 v73, v74
5956
5957 -    goto/16 :goto_964
5958 +    goto/16 :goto_969
5959
5960 -    :catch_afa
5961 +    :catch_aff
5962      move-exception v83
5963
5964      move-object/from16 v94, v95
5965
5966 -    goto/16 :goto_958
5967 +    goto/16 :goto_95d
5968
5969 -    :catch_aff
5970 +    :catch_b04
5971      move-exception v83
5972
5973      move-object/from16 v105, v106
5974
5975 -    goto/16 :goto_940
5976 +    goto/16 :goto_945
5977
5978 -    :catch_b04
5979 +    :catch_b09
5980      move-exception v83
5981
5982      move-object/from16 v70, v71
5983
5984 -    goto/16 :goto_904
5985 +    goto/16 :goto_909
5986
5987 -    :catch_b09
5988 +    :catch_b0e
5989      move-exception v83
5990
5991      move-object/from16 v135, v136
5992
5993 -    goto/16 :goto_8f8
5994 +    goto/16 :goto_8fd
5995
5996 -    :catch_b0e
5997 +    :catch_b13
5998      move-exception v83
5999
6000      move-object/from16 v137, v138
6001
6002 -    goto/16 :goto_8ec
6003 +    goto/16 :goto_8f1
6004
6005 -    :catch_b13
6006 +    :catch_b18
6007      move-exception v83
6008
6009 -    goto/16 :goto_8e0
6010 +    goto/16 :goto_8e5
6011
6012 -    :catch_b16
6013 +    :catch_b1b
6014      move-exception v83
6015
6016      move-object/from16 v29, v102
6017
6018 -    goto/16 :goto_8d2
6019 +    goto/16 :goto_8d7
6020
6021 -    :catch_b1b
6022 +    :catch_b20
6023      move-exception v83
6024
6025      move-object/from16 v121, v122
6026
6027 -    goto/16 :goto_8c6
6028 +    goto/16 :goto_8cb
6029
6030 -    :catch_b20
6031 +    :catch_b25
6032      move-exception v83
6033
6034      move-object/from16 v117, v118
6035
6036 -    goto/16 :goto_8a2
6037 +    goto/16 :goto_8a7
6038
6039 -    :catch_b25
6040 +    :catch_b2a
6041      move-exception v83
6042
6043      move-object/from16 v76, v77
6044
6045 -    goto/16 :goto_896
6046 +    goto/16 :goto_89b
6047
6048 -    :catch_b2a
6049 +    :catch_b2f
6050      move-exception v83
6051
6052      move-object/from16 v96, v97
6053
6054 -    goto/16 :goto_88a
6055 +    goto/16 :goto_88f
6056
6057 -    :catch_b2f
6058 +    :catch_b34
6059      move-exception v83
6060
6061      move-object/from16 v99, v100
6062
6063 -    goto/16 :goto_87e
6064 +    goto/16 :goto_883
6065
6066 -    :catch_b34
6067 +    :catch_b39
6068      move-exception v7
6069
6070 -    goto/16 :goto_333
6071 +    goto/16 :goto_338
6072
6073 -    :catch_b37
6074 +    :catch_b3c
6075      move-exception v83
6076
6077      move-object/from16 v88, v89
6078
6079 -    goto/16 :goto_84e
6080 +    goto/16 :goto_853
6081
6082 -    :catch_b3c
6083 +    :catch_b41
6084      move-exception v83
6085
6086      move-object/from16 v19, v90
6087 @@ -3259,9 +3298,9 @@
6088
6089      move-object/from16 v6, v93
6090
6091 -    goto/16 :goto_7ec
6092 +    goto/16 :goto_7f1
6093
6094 -    :catch_b4b
6095 +    :catch_b50
6096      move-exception v83
6097
6098      move-object/from16 v19, v90
6099 @@ -3278,9 +3317,9 @@
6100
6101      move-object/from16 v91, v92
6102
6103 -    goto/16 :goto_7ec
6104 +    goto/16 :goto_7f1
6105
6106 -    :catch_b5c
6107 +    :catch_b61
6108      move-exception v83
6109
6110      move-object/from16 v19, v90
6111 @@ -3295,9 +3334,9 @@
6112
6113      move-object/from16 v91, v92
6114
6115 -    goto/16 :goto_7ec
6116 +    goto/16 :goto_7f1
6117
6118 -    :catch_b6b
6119 +    :catch_b70
6120      move-exception v83
6121
6122      move-object/from16 v19, v90
6123 @@ -3310,9 +3349,9 @@
6124
6125      move-object/from16 v91, v92
6126
6127 -    goto/16 :goto_7ec
6128 +    goto/16 :goto_7f1
6129
6130 -    :catch_b78
6131 +    :catch_b7d
6132      move-exception v83
6133
6134      move-object/from16 v119, v120
6135 @@ -3329,9 +3368,9 @@
6136
6137      move-object/from16 v91, v92
6138
6139 -    goto/16 :goto_7ec
6140 +    goto/16 :goto_7f1
6141
6142 -    :catch_b89
6143 +    :catch_b8e
6144      move-exception v83
6145
6146      move-object/from16 v119, v120
6147 @@ -3344,9 +3383,9 @@
6148
6149      move-object/from16 v91, v92
6150
6151 -    goto/16 :goto_7ec
6152 +    goto/16 :goto_7f1
6153
6154 -    :catch_b96
6155 +    :catch_b9b
6156      move-exception v83
6157
6158      move-object/from16 v119, v120
6159 @@ -3357,9 +3396,9 @@
6160
6161      move-object/from16 v91, v92
6162
6163 -    goto/16 :goto_7ec
6164 +    goto/16 :goto_7f1
6165
6166 -    :catch_ba1
6167 +    :catch_ba6
6168      move-exception v83
6169
6170      move-object/from16 v119, v120
6171 @@ -3372,9 +3411,9 @@
6172
6173      move-object/from16 v91, v92
6174
6175 -    goto/16 :goto_7ec
6176 +    goto/16 :goto_7f1
6177
6178 -    :catch_bae
6179 +    :catch_bb3
6180      move-exception v83
6181
6182      move-object/from16 v119, v120
6183 @@ -3385,9 +3424,9 @@
6184
6185      move-object/from16 v91, v92
6186
6187 -    goto/16 :goto_7ec
6188 +    goto/16 :goto_7f1
6189
6190 -    :catch_bb9
6191 +    :catch_bbe
6192      move-exception v83
6193
6194      move-object/from16 v119, v120
6195 @@ -3398,17 +3437,17 @@
6196
6197      move-object/from16 v91, v92
6198
6199 -    goto/16 :goto_7ec
6200 +    goto/16 :goto_7f1
6201
6202 -    :catch_bc4
6203 +    :catch_bc9
6204      move-exception v83
6205
6206      move-object/from16 v59, v60
6207
6208 -    goto/16 :goto_7d4
6209 +    goto/16 :goto_7d9
6210
6211 -    :cond_bc9
6212 +    :cond_bce
6213      move-object/from16 v25, v101
6214
6215 -    goto/16 :goto_6b3
6216 +    goto/16 :goto_6b8
6217  .end method
6218 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali pdroid-services/smali/com/android/server/TelephonyRegistry$1.smali
6219 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali   2013-08-10 20:37:59.387214142 -0700
6220 +++ pdroid-services/smali/com/android/server/TelephonyRegistry$1.smali  2013-08-10 20:37:56.903214039 -0700
6221 @@ -36,7 +36,7 @@
6222
6223      iget v0, p1, Landroid/os/Message;->what:I
6224
6225 -    packed-switch v0, :pswitch_data_12
6226 +    packed-switch v0, :pswitch_data_10
6227
6228      :goto_5
6229      return-void
6230 @@ -46,16 +46,13 @@
6231
6232      iget-object v1, p0, Lcom/android/server/TelephonyRegistry$1;->this$0:Lcom/android/server/TelephonyRegistry;
6233
6234 -    #getter for: Lcom/android/server/TelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
6235 -    invoke-static {v1}, Lcom/android/server/TelephonyRegistry;->access$000(Lcom/android/server/TelephonyRegistry;)Landroid/os/Bundle;
6236 -
6237 -    move-result-object v1
6238 +    iget-object v1, v1, Lcom/android/server/TelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
6239
6240      invoke-virtual {v0, v1}, Lcom/android/server/TelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V
6241
6242      goto :goto_5
6243
6244 -    :pswitch_data_12
6245 +    :pswitch_data_10
6246      .packed-switch 0x1
6247          :pswitch_6
6248      .end packed-switch
6249 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$2.smali pdroid-services/smali/com/android/server/TelephonyRegistry$2.smali
6250 --- stock-services/smali/com/android/server/TelephonyRegistry$2.smali   2013-08-10 20:37:59.387214142 -0700
6251 +++ pdroid-services/smali/com/android/server/TelephonyRegistry$2.smali  2013-08-10 20:37:56.903214039 -0700
6252 @@ -51,14 +51,14 @@
6253      iget-object v1, p0, Lcom/android/server/TelephonyRegistry$2;->this$0:Lcom/android/server/TelephonyRegistry;
6254
6255      #getter for: Lcom/android/server/TelephonyRegistry;->mHandler:Landroid/os/Handler;
6256 -    invoke-static {v1}, Lcom/android/server/TelephonyRegistry;->access$100(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6257 +    invoke-static {v1}, Lcom/android/server/TelephonyRegistry;->access$000(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6258
6259      move-result-object v1
6260
6261      iget-object v2, p0, Lcom/android/server/TelephonyRegistry$2;->this$0:Lcom/android/server/TelephonyRegistry;
6262
6263      #getter for: Lcom/android/server/TelephonyRegistry;->mHandler:Landroid/os/Handler;
6264 -    invoke-static {v2}, Lcom/android/server/TelephonyRegistry;->access$100(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6265 +    invoke-static {v2}, Lcom/android/server/TelephonyRegistry;->access$000(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6266
6267      move-result-object v2
6268
6269 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali pdroid-services/smali/com/android/server/TelephonyRegistry$Record.smali
6270 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali      2013-08-10 20:37:59.387214142 -0700
6271 +++ pdroid-services/smali/com/android/server/TelephonyRegistry$Record.smali     2013-08-10 20:37:56.903214039 -0700
6272 @@ -1,4 +1,4 @@
6273 -.class Lcom/android/server/TelephonyRegistry$Record;
6274 +.class public Lcom/android/server/TelephonyRegistry$Record;
6275  .super Ljava/lang/Object;
6276  .source "TelephonyRegistry.java"
6277
6278 @@ -9,7 +9,7 @@
6279  .end annotation
6280
6281  .annotation system Ldalvik/annotation/InnerClass;
6282 -    accessFlags = 0xa
6283 +    accessFlags = 0x9
6284      name = "Record"
6285  .end annotation
6286
6287 @@ -27,21 +27,13 @@
6288
6289
6290  # direct methods
6291 -.method private constructor <init>()V
6292 +.method public constructor <init>()V
6293      .registers 1
6294
6295      invoke-direct {p0}, Ljava/lang/Object;-><init>()V
6296
6297      return-void
6298  .end method
6299 -
6300 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
6301 -    .registers 2
6302 -
6303 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6304 -
6305 -    return-void
6306 -.end method
6307
6308
6309  # virtual methods
6310 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali pdroid-services/smali/com/android/server/TelephonyRegistry.smali
6311 --- stock-services/smali/com/android/server/TelephonyRegistry.smali     2013-08-10 20:37:59.391214142 -0700
6312 +++ pdroid-services/smali/com/android/server/TelephonyRegistry.smali    2013-08-10 20:37:56.847214037 -0700
6313 @@ -28,13 +28,13 @@
6314
6315  .field private final mBroadcastReceiver:Landroid/content/BroadcastReceiver;
6316
6317 -.field private mCallForwarding:Z
6318 +.field protected mCallForwarding:Z
6319
6320 -.field private mCallIncomingNumber:Ljava/lang/String;
6321 +.field protected mCallIncomingNumber:Ljava/lang/String;
6322
6323 -.field private mCallState:I
6324 +.field protected mCallState:I
6325
6326 -.field private mCellInfo:Ljava/util/List;
6327 +.field protected mCellInfo:Ljava/util/List;
6328      .annotation system Ldalvik/annotation/Signature;
6329          value = {
6330              "Ljava/util/List",
6331 @@ -45,7 +45,7 @@
6332      .end annotation
6333  .end field
6334
6335 -.field private mCellLocation:Landroid/os/Bundle;
6336 +.field protected mCellLocation:Landroid/os/Bundle;
6337
6338  .field private mConnectedApns:Ljava/util/ArrayList;
6339      .annotation system Ldalvik/annotation/Signature;
6340 @@ -58,9 +58,9 @@
6341      .end annotation
6342  .end field
6343
6344 -.field private final mContext:Landroid/content/Context;
6345 +.field protected final mContext:Landroid/content/Context;
6346
6347 -.field private mDataActivity:I
6348 +.field protected mDataActivity:I
6349
6350  .field private mDataConnectionApn:Ljava/lang/String;
6351
6352 @@ -68,21 +68,21 @@
6353
6354  .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6355
6356 -.field private mDataConnectionNetworkType:I
6357 +.field protected mDataConnectionNetworkType:I
6358
6359  .field private mDataConnectionPossible:Z
6360
6361  .field private mDataConnectionReason:Ljava/lang/String;
6362
6363 -.field private mDataConnectionState:I
6364 +.field protected mDataConnectionState:I
6365
6366  .field private final mHandler:Landroid/os/Handler;
6367
6368 -.field private mMessageWaiting:Z
6369 +.field protected mMessageWaiting:Z
6370
6371 -.field private mOtaspMode:I
6372 +.field protected mOtaspMode:I
6373
6374 -.field private final mRecords:Ljava/util/ArrayList;
6375 +.field protected final mRecords:Ljava/util/ArrayList;
6376      .annotation system Ldalvik/annotation/Signature;
6377          value = {
6378              "Ljava/util/ArrayList",
6379 @@ -93,7 +93,7 @@
6380      .end annotation
6381  .end field
6382
6383 -.field private final mRemoveList:Ljava/util/ArrayList;
6384 +.field protected final mRemoveList:Ljava/util/ArrayList;
6385      .annotation system Ldalvik/annotation/Signature;
6386          value = {
6387              "Ljava/util/ArrayList",
6388 @@ -104,13 +104,13 @@
6389      .end annotation
6390  .end field
6391
6392 -.field private mServiceState:Landroid/telephony/ServiceState;
6393 +.field protected mServiceState:Landroid/telephony/ServiceState;
6394
6395 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6396 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6397
6398
6399  # direct methods
6400 -.method constructor <init>(Landroid/content/Context;)V
6401 +.method protected constructor <init>(Landroid/content/Context;)V
6402      .registers 5
6403
6404      const/4 v2, 0x0
6405 @@ -221,15 +221,7 @@
6406      return-void
6407  .end method
6408
6409 -.method static synthetic access$000(Lcom/android/server/TelephonyRegistry;)Landroid/os/Bundle;
6410 -    .registers 2
6411 -
6412 -    iget-object v0, p0, Lcom/android/server/TelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
6413 -
6414 -    return-object v0
6415 -.end method
6416 -
6417 -.method static synthetic access$100(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6418 +.method static synthetic access$000(Lcom/android/server/TelephonyRegistry;)Landroid/os/Handler;
6419      .registers 2
6420
6421      iget-object v0, p0, Lcom/android/server/TelephonyRegistry;->mHandler:Landroid/os/Handler;
6422 @@ -431,7 +423,7 @@
6423      return-void
6424  .end method
6425
6426 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6427 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6428      .registers 8
6429
6430      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6431 @@ -441,29 +433,29 @@
6432      :try_start_4
6433      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6434
6435 -    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6436 -
6437 -    move-result v5
6438 -
6439 -    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6440 -    :try_end_d
6441 -    .catchall {:try_start_4 .. :try_end_d} :catchall_2a
6442 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2f
6443 +    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6444 +    :try_end_9
6445 +    .catchall {:try_start_4 .. :try_end_9} :catchall_2b
6446 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_30
6447
6448 -    :goto_d
6449 +    :goto_9
6450      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6451
6452      new-instance v3, Landroid/content/Intent;
6453
6454 -    const-string v4, "android.intent.action.SERVICE_STATE"
6455 +    const-string v4, "android.intent.action.SIG_STR"
6456
6457      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6458
6459 +    const/high16 v4, 0x2000
6460 +
6461 +    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6462 +
6463      new-instance v0, Landroid/os/Bundle;
6464
6465      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6466
6467 -    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6468 +    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6469
6470      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6471
6472 @@ -475,20 +467,68 @@
6473
6474      return-void
6475
6476 -    :catchall_2a
6477 +    :catchall_2b
6478      move-exception v4
6479
6480      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6481
6482      throw v4
6483
6484 -    :catch_2f
6485 +    :catch_30
6486      move-exception v4
6487
6488 -    goto :goto_d
6489 +    goto :goto_9
6490  .end method
6491
6492 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6493 +.method private validateEventsAndUserLocked(Lcom/android/server/TelephonyRegistry$Record;I)Z
6494 +    .registers 8
6495 +
6496 +    invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6497 +
6498 +    move-result-wide v0
6499 +
6500 +    const/4 v3, 0x0
6501 +
6502 +    :try_start_5
6503 +    invoke-static {}, Landroid/app/ActivityManager;->getCurrentUser()I
6504 +
6505 +    move-result v2
6506 +
6507 +    iget v4, p1, Lcom/android/server/TelephonyRegistry$Record;->callerUid:I
6508 +
6509 +    if-ne v4, v2, :cond_17
6510 +
6511 +    iget v4, p1, Lcom/android/server/TelephonyRegistry$Record;->events:I
6512 +    :try_end_f
6513 +    .catchall {:try_start_5 .. :try_end_f} :catchall_19
6514 +
6515 +    and-int/2addr v4, p2
6516 +
6517 +    if-eqz v4, :cond_17
6518 +
6519 +    const/4 v3, 0x1
6520 +
6521 +    :goto_13
6522 +    invoke-static {v0, v1}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6523 +
6524 +    return v3
6525 +
6526 +    :cond_17
6527 +    const/4 v3, 0x0
6528 +
6529 +    goto :goto_13
6530 +
6531 +    :catchall_19
6532 +    move-exception v4
6533 +
6534 +    invoke-static {v0, v1}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6535 +
6536 +    throw v4
6537 +.end method
6538 +
6539 +
6540 +# virtual methods
6541 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6542      .registers 8
6543
6544      invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6545 @@ -498,29 +538,29 @@
6546      :try_start_4
6547      iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6548
6549 -    invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6550 -    :try_end_9
6551 -    .catchall {:try_start_4 .. :try_end_9} :catchall_2b
6552 -    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_30
6553 +    invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6554
6555 -    :goto_9
6556 +    move-result v5
6557 +
6558 +    invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6559 +    :try_end_d
6560 +    .catchall {:try_start_4 .. :try_end_d} :catchall_2a
6561 +    .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2f
6562 +
6563 +    :goto_d
6564      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6565
6566      new-instance v3, Landroid/content/Intent;
6567
6568 -    const-string v4, "android.intent.action.SIG_STR"
6569 +    const-string v4, "android.intent.action.SERVICE_STATE"
6570
6571      invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6572
6573 -    const/high16 v4, 0x2000
6574 -
6575 -    invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6576 -
6577      new-instance v0, Landroid/os/Bundle;
6578
6579      invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6580
6581 -    invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6582 +    invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6583
6584      invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6585
6586 @@ -532,20 +572,20 @@
6587
6588      return-void
6589
6590 -    :catchall_2b
6591 +    :catchall_2a
6592      move-exception v4
6593
6594      invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6595
6596      throw v4
6597
6598 -    :catch_30
6599 +    :catch_2f
6600      move-exception v4
6601
6602 -    goto :goto_9
6603 +    goto :goto_d
6604  .end method
6605
6606 -.method private checkListenerPermission(I)V
6607 +.method protected checkListenerPermission(I)V
6608      .registers 5
6609
6610      const/4 v2, 0x0
6611 @@ -586,7 +626,7 @@
6612      return-void
6613  .end method
6614
6615 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6616 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6617      .registers 5
6618
6619      iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6620 @@ -656,157 +696,6 @@
6621      goto :goto_b
6622  .end method
6623
6624 -.method private handleRemoveListLocked()V
6625 -    .registers 4
6626 -
6627 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6628 -
6629 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6630 -
6631 -    move-result v2
6632 -
6633 -    if-lez v2, :cond_23
6634 -
6635 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6636 -
6637 -    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6638 -
6639 -    move-result-object v1
6640 -
6641 -    :goto_e
6642 -    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6643 -
6644 -    move-result v2
6645 -
6646 -    if-eqz v2, :cond_1e
6647 -
6648 -    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6649 -
6650 -    move-result-object v0
6651 -
6652 -    check-cast v0, Landroid/os/IBinder;
6653 -
6654 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6655 -
6656 -    goto :goto_e
6657 -
6658 -    :cond_1e
6659 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6660 -
6661 -    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6662 -
6663 -    :cond_23
6664 -    return-void
6665 -.end method
6666 -
6667 -.method private remove(Landroid/os/IBinder;)V
6668 -    .registers 6
6669 -
6670 -    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6671 -
6672 -    monitor-enter v3
6673 -
6674 -    :try_start_3
6675 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6676 -
6677 -    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6678 -
6679 -    move-result v1
6680 -
6681 -    const/4 v0, 0x0
6682 -
6683 -    :goto_a
6684 -    if-ge v0, v1, :cond_22
6685 -
6686 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6687 -
6688 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6689 -
6690 -    move-result-object v2
6691 -
6692 -    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6693 -
6694 -    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6695 -
6696 -    if-ne v2, p1, :cond_1f
6697 -
6698 -    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6699 -
6700 -    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6701 -
6702 -    monitor-exit v3
6703 -
6704 -    :goto_1e
6705 -    return-void
6706 -
6707 -    :cond_1f
6708 -    add-int/lit8 v0, v0, 0x1
6709 -
6710 -    goto :goto_a
6711 -
6712 -    :cond_22
6713 -    monitor-exit v3
6714 -
6715 -    goto :goto_1e
6716 -
6717 -    :catchall_24
6718 -    move-exception v2
6719 -
6720 -    monitor-exit v3
6721 -    :try_end_26
6722 -    .catchall {:try_start_3 .. :try_end_26} :catchall_24
6723 -
6724 -    throw v2
6725 -.end method
6726 -
6727 -.method private validateEventsAndUserLocked(Lcom/android/server/TelephonyRegistry$Record;I)Z
6728 -    .registers 8
6729 -
6730 -    invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6731 -
6732 -    move-result-wide v0
6733 -
6734 -    const/4 v3, 0x0
6735 -
6736 -    :try_start_5
6737 -    invoke-static {}, Landroid/app/ActivityManager;->getCurrentUser()I
6738 -
6739 -    move-result v2
6740 -
6741 -    iget v4, p1, Lcom/android/server/TelephonyRegistry$Record;->callerUid:I
6742 -
6743 -    if-ne v4, v2, :cond_17
6744 -
6745 -    iget v4, p1, Lcom/android/server/TelephonyRegistry$Record;->events:I
6746 -    :try_end_f
6747 -    .catchall {:try_start_5 .. :try_end_f} :catchall_19
6748 -
6749 -    and-int/2addr v4, p2
6750 -
6751 -    if-eqz v4, :cond_17
6752 -
6753 -    const/4 v3, 0x1
6754 -
6755 -    :goto_13
6756 -    invoke-static {v0, v1}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6757 -
6758 -    return v3
6759 -
6760 -    :cond_17
6761 -    const/4 v3, 0x0
6762 -
6763 -    goto :goto_13
6764 -
6765 -    :catchall_19
6766 -    move-exception v4
6767 -
6768 -    invoke-static {v0, v1}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6769 -
6770 -    throw v4
6771 -.end method
6772 -
6773 -
6774 -# virtual methods
6775  .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6776      .registers 10
6777
6778 @@ -1304,6 +1193,49 @@
6779      goto/16 :goto_32
6780  .end method
6781
6782 +.method protected handleRemoveListLocked()V
6783 +    .registers 4
6784 +
6785 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6786 +
6787 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6788 +
6789 +    move-result v2
6790 +
6791 +    if-lez v2, :cond_23
6792 +
6793 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6794 +
6795 +    invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6796 +
6797 +    move-result-object v1
6798 +
6799 +    :goto_e
6800 +    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6801 +
6802 +    move-result v2
6803 +
6804 +    if-eqz v2, :cond_1e
6805 +
6806 +    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6807 +
6808 +    move-result-object v0
6809 +
6810 +    check-cast v0, Landroid/os/IBinder;
6811 +
6812 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6813 +
6814 +    goto :goto_e
6815 +
6816 +    :cond_1e
6817 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6818 +
6819 +    invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6820 +
6821 +    :cond_23
6822 +    return-void
6823 +.end method
6824 +
6825  .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6826      .registers 20
6827
6828 @@ -1315,11 +1247,11 @@
6829
6830      move-result v7
6831
6832 -    if-eqz p3, :cond_150
6833 +    if-eqz p3, :cond_14f
6834
6835      move/from16 v0, p3
6836
6837 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6838 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6839
6840      iget-object v12, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6841
6842 @@ -1336,7 +1268,7 @@
6843
6844      invoke-virtual {v11}, Ljava/util/ArrayList;->size()I
6845      :try_end_1c
6846 -    .catchall {:try_start_13 .. :try_end_1c} :catchall_f7
6847 +    .catchall {:try_start_13 .. :try_end_1c} :catchall_f6
6848
6849      move-result v1
6850
6851 @@ -1356,7 +1288,7 @@
6852
6853      check-cast v8, Lcom/android/server/TelephonyRegistry$Record;
6854      :try_end_29
6855 -    .catchall {:try_start_21 .. :try_end_29} :catchall_158
6856 +    .catchall {:try_start_21 .. :try_end_29} :catchall_157
6857
6858      :try_start_29
6859      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6860 @@ -1374,7 +1306,7 @@
6861
6862      iput v0, v8, Lcom/android/server/TelephonyRegistry$Record;->events:I
6863      :try_end_37
6864 -    .catchall {:try_start_29 .. :try_end_37} :catchall_f7
6865 +    .catchall {:try_start_29 .. :try_end_37} :catchall_f6
6866
6867      if-eqz p4, :cond_d7
6868
6869 @@ -1393,8 +1325,8 @@
6870
6871      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6872      :try_end_49
6873 -    .catchall {:try_start_3d .. :try_end_49} :catchall_f7
6874 -    .catch Landroid/os/RemoteException; {:try_start_3d .. :try_end_49} :catch_fa
6875 +    .catchall {:try_start_3d .. :try_end_49} :catchall_f6
6876 +    .catch Landroid/os/RemoteException; {:try_start_3d .. :try_end_49} :catch_f9
6877
6878      :cond_49
6879      :goto_49
6880 @@ -1420,8 +1352,8 @@
6881      :cond_5a
6882      invoke-interface {v11, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6883      :try_end_5d
6884 -    .catchall {:try_start_4d .. :try_end_5d} :catchall_f7
6885 -    .catch Landroid/os/RemoteException; {:try_start_4d .. :try_end_5d} :catch_102
6886 +    .catchall {:try_start_4d .. :try_end_5d} :catchall_f6
6887 +    .catch Landroid/os/RemoteException; {:try_start_4d .. :try_end_5d} :catch_101
6888
6889      :cond_5d
6890      :goto_5d
6891 @@ -1436,8 +1368,8 @@
6892
6893      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6894      :try_end_68
6895 -    .catchall {:try_start_61 .. :try_end_68} :catchall_f7
6896 -    .catch Landroid/os/RemoteException; {:try_start_61 .. :try_end_68} :catch_10a
6897 +    .catchall {:try_start_61 .. :try_end_68} :catchall_f6
6898 +    .catch Landroid/os/RemoteException; {:try_start_61 .. :try_end_68} :catch_109
6899
6900      :cond_68
6901      :goto_68
6902 @@ -1452,8 +1384,8 @@
6903
6904      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6905      :try_end_73
6906 -    .catchall {:try_start_6c .. :try_end_73} :catchall_f7
6907 -    .catch Landroid/os/RemoteException; {:try_start_6c .. :try_end_73} :catch_112
6908 +    .catchall {:try_start_6c .. :try_end_73} :catchall_f6
6909 +    .catch Landroid/os/RemoteException; {:try_start_6c .. :try_end_73} :catch_111
6910
6911      :cond_73
6912      :goto_73
6913 @@ -1462,7 +1394,7 @@
6914      :try_start_75
6915      invoke-direct {p0, v8, v11}, Lcom/android/server/TelephonyRegistry;->validateEventsAndUserLocked(Lcom/android/server/TelephonyRegistry$Record;I)Z
6916      :try_end_78
6917 -    .catchall {:try_start_75 .. :try_end_78} :catchall_f7
6918 +    .catchall {:try_start_75 .. :try_end_78} :catchall_f6
6919
6920      move-result v11
6921
6922 @@ -1479,8 +1411,8 @@
6923
6924      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6925      :try_end_87
6926 -    .catchall {:try_start_7b .. :try_end_87} :catchall_f7
6927 -    .catch Landroid/os/RemoteException; {:try_start_7b .. :try_end_87} :catch_11a
6928 +    .catchall {:try_start_7b .. :try_end_87} :catchall_f6
6929 +    .catch Landroid/os/RemoteException; {:try_start_7b .. :try_end_87} :catch_119
6930
6931      :cond_87
6932      :goto_87
6933 @@ -1497,8 +1429,8 @@
6934
6935      invoke-interface {v11, v13, v14}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6936      :try_end_94
6937 -    .catchall {:try_start_8b .. :try_end_94} :catchall_f7
6938 -    .catch Landroid/os/RemoteException; {:try_start_8b .. :try_end_94} :catch_122
6939 +    .catchall {:try_start_8b .. :try_end_94} :catchall_f6
6940 +    .catch Landroid/os/RemoteException; {:try_start_8b .. :try_end_94} :catch_121
6941
6942      :cond_94
6943      :goto_94
6944 @@ -1515,8 +1447,8 @@
6945
6946      invoke-interface {v11, v13, v14}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6947      :try_end_a1
6948 -    .catchall {:try_start_98 .. :try_end_a1} :catchall_f7
6949 -    .catch Landroid/os/RemoteException; {:try_start_98 .. :try_end_a1} :catch_12a
6950 +    .catchall {:try_start_98 .. :try_end_a1} :catchall_f6
6951 +    .catch Landroid/os/RemoteException; {:try_start_98 .. :try_end_a1} :catch_129
6952
6953      :cond_a1
6954      :goto_a1
6955 @@ -1533,8 +1465,8 @@
6956
6957      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6958      :try_end_ae
6959 -    .catchall {:try_start_a7 .. :try_end_ae} :catchall_f7
6960 -    .catch Landroid/os/RemoteException; {:try_start_a7 .. :try_end_ae} :catch_132
6961 +    .catchall {:try_start_a7 .. :try_end_ae} :catchall_f6
6962 +    .catch Landroid/os/RemoteException; {:try_start_a7 .. :try_end_ae} :catch_131
6963
6964      :cond_ae
6965      :goto_ae
6966 @@ -1551,8 +1483,8 @@
6967
6968      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6969      :try_end_bb
6970 -    .catchall {:try_start_b4 .. :try_end_bb} :catchall_f7
6971 -    .catch Landroid/os/RemoteException; {:try_start_b4 .. :try_end_bb} :catch_13a
6972 +    .catchall {:try_start_b4 .. :try_end_bb} :catchall_f6
6973 +    .catch Landroid/os/RemoteException; {:try_start_b4 .. :try_end_bb} :catch_139
6974
6975      :cond_bb
6976      :goto_bb
6977 @@ -1569,8 +1501,8 @@
6978
6979      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6980      :try_end_c8
6981 -    .catchall {:try_start_c1 .. :try_end_c8} :catchall_f7
6982 -    .catch Landroid/os/RemoteException; {:try_start_c1 .. :try_end_c8} :catch_142
6983 +    .catchall {:try_start_c1 .. :try_end_c8} :catchall_f6
6984 +    .catch Landroid/os/RemoteException; {:try_start_c1 .. :try_end_c8} :catch_141
6985
6986      :cond_c8
6987      :goto_c8
6988 @@ -1579,7 +1511,7 @@
6989      :try_start_ca
6990      invoke-direct {p0, v8, v11}, Lcom/android/server/TelephonyRegistry;->validateEventsAndUserLocked(Lcom/android/server/TelephonyRegistry$Record;I)Z
6991      :try_end_cd
6992 -    .catchall {:try_start_ca .. :try_end_cd} :catchall_f7
6993 +    .catchall {:try_start_ca .. :try_end_cd} :catchall_f6
6994
6995      move-result v11
6996
6997 @@ -1592,15 +1524,15 @@
6998
6999      invoke-interface {v11, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Ljava/util/List;)V
7000      :try_end_d7
7001 -    .catchall {:try_start_d0 .. :try_end_d7} :catchall_f7
7002 -    .catch Landroid/os/RemoteException; {:try_start_d0 .. :try_end_d7} :catch_149
7003 +    .catchall {:try_start_d0 .. :try_end_d7} :catchall_f6
7004 +    .catch Landroid/os/RemoteException; {:try_start_d0 .. :try_end_d7} :catch_148
7005
7006      :cond_d7
7007      :goto_d7
7008      :try_start_d7
7009      monitor-exit v12
7010      :try_end_d8
7011 -    .catchall {:try_start_d7 .. :try_end_d8} :catchall_f7
7012 +    .catchall {:try_start_d7 .. :try_end_d8} :catchall_f6
7013
7014      :goto_d8
7015      return-void
7016 @@ -1616,13 +1548,11 @@
7017      :try_start_de
7018      new-instance v8, Lcom/android/server/TelephonyRegistry$Record;
7019
7020 -    const/4 v11, 0x0
7021 +    invoke-direct {v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
7022 +    :try_end_e3
7023 +    .catchall {:try_start_de .. :try_end_e3} :catchall_157
7024
7025 -    invoke-direct {v8, v11}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
7026 -    :try_end_e4
7027 -    .catchall {:try_start_de .. :try_end_e4} :catchall_158
7028 -
7029 -    :try_start_e4
7030 +    :try_start_e3
7031      iput-object v2, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7032
7033      move-object/from16 v0, p2
7034 @@ -1641,133 +1571,133 @@
7035
7036      goto/16 :goto_2d
7037
7038 -    :catchall_f7
7039 +    :catchall_f6
7040      move-exception v11
7041
7042 -    :goto_f8
7043 +    :goto_f7
7044      monitor-exit v12
7045 -    :try_end_f9
7046 -    .catchall {:try_start_e4 .. :try_end_f9} :catchall_f7
7047 +    :try_end_f8
7048 +    .catchall {:try_start_e3 .. :try_end_f8} :catchall_f6
7049
7050      throw v11
7051
7052 -    :catch_fa
7053 +    :catch_f9
7054      move-exception v4
7055
7056 -    :try_start_fb
7057 +    :try_start_fa
7058      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7059
7060 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7061 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7062
7063      goto/16 :goto_49
7064
7065 -    :catch_102
7066 +    :catch_101
7067      move-exception v4
7068
7069      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7070
7071 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7072 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7073
7074      goto/16 :goto_5d
7075
7076 -    :catch_10a
7077 +    :catch_109
7078      move-exception v4
7079
7080      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7081
7082 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7083 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7084
7085      goto/16 :goto_68
7086
7087 -    :catch_112
7088 +    :catch_111
7089      move-exception v4
7090
7091      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7092
7093 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7094 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7095
7096      goto/16 :goto_73
7097
7098 -    :catch_11a
7099 +    :catch_119
7100      move-exception v4
7101
7102      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7103
7104 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7105 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7106
7107      goto/16 :goto_87
7108
7109 -    :catch_122
7110 +    :catch_121
7111      move-exception v4
7112
7113      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7114
7115 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7116 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7117
7118      goto/16 :goto_94
7119
7120 -    :catch_12a
7121 +    :catch_129
7122      move-exception v4
7123
7124      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7125
7126 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7127 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7128
7129      goto/16 :goto_a1
7130
7131 -    :catch_132
7132 +    :catch_131
7133      move-exception v4
7134
7135      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7136
7137 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7138 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7139
7140      goto/16 :goto_ae
7141
7142 -    :catch_13a
7143 +    :catch_139
7144      move-exception v4
7145
7146      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7147
7148 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7149 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7150
7151      goto/16 :goto_bb
7152
7153 -    :catch_142
7154 +    :catch_141
7155      move-exception v4
7156
7157      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7158
7159 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7160 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7161
7162      goto :goto_c8
7163
7164 -    :catch_149
7165 +    :catch_148
7166      move-exception v4
7167
7168      iget-object v11, v8, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7169
7170 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7171 -    :try_end_14f
7172 -    .catchall {:try_start_fb .. :try_end_14f} :catchall_f7
7173 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7174 +    :try_end_14e
7175 +    .catchall {:try_start_fa .. :try_end_14e} :catchall_f6
7176
7177      goto :goto_d7
7178
7179 -    :cond_150
7180 +    :cond_14f
7181      invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
7182
7183      move-result-object v11
7184
7185 -    invoke-direct {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7186 +    invoke-virtual {p0, v11}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
7187
7188      goto :goto_d8
7189
7190 -    :catchall_158
7191 +    :catchall_157
7192      move-exception v11
7193
7194      move-object v8, v9
7195
7196 -    goto :goto_f8
7197 +    goto :goto_f7
7198  .end method
7199
7200  .method public notifyCallForwardingChanged(Z)V
7201 @@ -1775,7 +1705,7 @@
7202
7203      const-string v3, "notifyCallForwardingChanged()"
7204
7205 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7206 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7207
7208      move-result v3
7209
7210 @@ -1853,7 +1783,7 @@
7211
7212      :cond_38
7213      :try_start_38
7214 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7215 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7216
7217      monitor-exit v4
7218      :try_end_3c
7219 @@ -1867,7 +1797,7 @@
7220
7221      const-string v3, "notifyCallState()"
7222
7223 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7224 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7225
7226      move-result v3
7227
7228 @@ -1947,7 +1877,7 @@
7229
7230      :cond_3a
7231      :try_start_3a
7232 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7233 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7234
7235      monitor-exit v4
7236      :try_end_3e
7237 @@ -1972,7 +1902,7 @@
7238
7239      const-string v3, "notifyCellInfo()"
7240
7241 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7242 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7243
7244      move-result v3
7245
7246 @@ -2052,7 +1982,7 @@
7247
7248      :cond_3a
7249      :try_start_3a
7250 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7251 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7252
7253      monitor-exit v4
7254      :try_end_3e
7255 @@ -2066,7 +1996,7 @@
7256
7257      const-string v3, "notifyCellLocation()"
7258
7259 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7260 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7261
7262      move-result v3
7263
7264 @@ -2150,7 +2080,7 @@
7265
7266      :cond_3f
7267      :try_start_3f
7268 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7269 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7270
7271      monitor-exit v4
7272      :try_end_43
7273 @@ -2164,7 +2094,7 @@
7274
7275      const-string v3, "notifyDataActivity()"
7276
7277 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7278 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7279
7280      move-result v3
7281
7282 @@ -2242,7 +2172,7 @@
7283
7284      :cond_38
7285      :try_start_38
7286 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7287 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7288
7289      monitor-exit v4
7290      :try_end_3c
7291 @@ -2256,7 +2186,7 @@
7292
7293      const-string v1, "notifyDataConnection()"
7294
7295 -    invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7296 +    invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7297
7298      move-result v1
7299
7300 @@ -2424,7 +2354,7 @@
7301      goto :goto_28
7302
7303      :cond_89
7304 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7305 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7306
7307      :cond_8c
7308      monitor-exit v2
7309 @@ -2459,7 +2389,7 @@
7310
7311      const-string v0, "notifyDataConnectionFailed()"
7312
7313 -    invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7314 +    invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7315
7316      move-result v0
7317
7318 @@ -2479,7 +2409,7 @@
7319
7320      const-string v3, "notifyMessageWaitingChanged()"
7321
7322 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7323 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7324
7325      move-result v3
7326
7327 @@ -2557,7 +2487,7 @@
7328
7329      :cond_38
7330      :try_start_38
7331 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7332 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7333
7334      monitor-exit v4
7335      :try_end_3c
7336 @@ -2571,7 +2501,7 @@
7337
7338      const-string v3, "notifyOtaspChanged()"
7339
7340 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7341 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7342
7343      move-result v3
7344
7345 @@ -2649,7 +2579,7 @@
7346
7347      :cond_38
7348      :try_start_38
7349 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7350 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7351
7352      monitor-exit v4
7353      :try_end_3c
7354 @@ -2659,11 +2589,11 @@
7355  .end method
7356
7357  .method public notifyServiceState(Landroid/telephony/ServiceState;)V
7358 -    .registers 8
7359 +    .registers 10
7360
7361      const-string v3, "notifyServiceState()"
7362
7363 -    invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7364 +    invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7365
7366      move-result v3
7367
7368 @@ -2680,19 +2610,29 @@
7369      :try_start_c
7370      iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7371
7372 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7373 +
7374 +    const-string v5, ""
7375 +
7376 +    const-string v6, ""
7377 +
7378 +    const-string v7, ""
7379 +
7380 +    invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7381 +
7382      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7383
7384      invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
7385
7386      move-result-object v1
7387
7388 -    :cond_14
7389 -    :goto_14
7390 +    :cond_1f
7391 +    :goto_1f
7392      invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
7393
7394      move-result v3
7395
7396 -    if-eqz v3, :cond_3d
7397 +    if-eqz v3, :cond_51
7398
7399      invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
7400
7401 @@ -2701,14 +2641,22 @@
7402      check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7403
7404      iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
7405 -    :try_end_22
7406 -    .catchall {:try_start_c .. :try_end_22} :catchall_3a
7407 +    :try_end_2d
7408 +    .catchall {:try_start_c .. :try_end_2d} :catchall_4e
7409
7410      and-int/lit8 v3, v3, 0x1
7411
7412 -    if-eqz v3, :cond_14
7413 +    if-eqz v3, :cond_1f
7414 +
7415 +    :try_start_31
7416 +    const-string v3, ""
7417 +
7418 +    const-string v5, ""
7419 +
7420 +    const-string v6, ""
7421 +
7422 +    invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7423
7424 -    :try_start_26
7425      iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
7426
7427      new-instance v5, Landroid/telephony/ServiceState;
7428 @@ -2716,42 +2664,42 @@
7429      invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
7430
7431      invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
7432 -    :try_end_30
7433 -    .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7434 -    .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7435 +    :try_end_44
7436 +    .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7437 +    .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7438
7439 -    goto :goto_14
7440 +    goto :goto_1f
7441
7442 -    :catch_31
7443 +    :catch_45
7444      move-exception v0
7445
7446 -    :try_start_32
7447 +    :try_start_46
7448      iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7449
7450      iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7451
7452      invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7453
7454 -    goto :goto_14
7455 +    goto :goto_1f
7456
7457 -    :catchall_3a
7458 +    :catchall_4e
7459      move-exception v3
7460
7461      monitor-exit v4
7462 -    :try_end_3c
7463 -    .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7464 +    :try_end_50
7465 +    .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7466
7467      throw v3
7468
7469 -    :cond_3d
7470 -    :try_start_3d
7471 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7472 +    :cond_51
7473 +    :try_start_51
7474 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7475
7476      monitor-exit v4
7477 -    :try_end_41
7478 -    .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7479 +    :try_end_55
7480 +    .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7481
7482 -    invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7483 +    invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7484
7485      goto :goto_8
7486  .end method
7487 @@ -2761,7 +2709,7 @@
7488
7489      const-string v4, "notifySignalStrength()"
7490
7491 -    invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7492 +    invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7493
7494      move-result v4
7495
7496 @@ -2884,7 +2832,7 @@
7497      goto :goto_30
7498
7499      :cond_5a
7500 -    invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7501 +    invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7502
7503      monitor-exit v5
7504      :try_end_5e
7505 @@ -2895,6 +2843,66 @@
7506      goto :goto_8
7507  .end method
7508
7509 +.method protected remove(Landroid/os/IBinder;)V
7510 +    .registers 6
7511 +
7512 +    iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7513 +
7514 +    monitor-enter v3
7515 +
7516 +    :try_start_3
7517 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7518 +
7519 +    invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7520 +
7521 +    move-result v1
7522 +
7523 +    const/4 v0, 0x0
7524 +
7525 +    :goto_a
7526 +    if-ge v0, v1, :cond_22
7527 +
7528 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7529 +
7530 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7531 +
7532 +    move-result-object v2
7533 +
7534 +    check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7535 +
7536 +    iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7537 +
7538 +    if-ne v2, p1, :cond_1f
7539 +
7540 +    iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7541 +
7542 +    invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7543 +
7544 +    monitor-exit v3
7545 +
7546 +    :goto_1e
7547 +    return-void
7548 +
7549 +    :cond_1f
7550 +    add-int/lit8 v0, v0, 0x1
7551 +
7552 +    goto :goto_a
7553 +
7554 +    :cond_22
7555 +    monitor-exit v3
7556 +
7557 +    goto :goto_1e
7558 +
7559 +    :catchall_24
7560 +    move-exception v2
7561 +
7562 +    monitor-exit v3
7563 +    :try_end_26
7564 +    .catchall {:try_start_3 .. :try_end_26} :catchall_24
7565 +
7566 +    throw v2
7567 +.end method
7568 +
7569  .method public systemReady()V
7570      .registers 4
7571