patches/openpdroid/4.2/aosp-ever/20130109/services.patch

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