patches/pdroid/ics/aosp/20120624/services.patch

   1 diff -Npru stock_services/smali/com/android/server/am/ActivityManagerService.smali moded_services/smali/com/android/server/am/ActivityManagerService.smali
   2 --- stock_services/smali/com/android/server/am/ActivityManagerService.smali     2012-06-24 14:05:08.302193026 -0700
   3 +++ moded_services/smali/com/android/server/am/ActivityManagerService.smali     2012-06-24 14:05:17.920480751 -0700
   4 @@ -13093,6 +13093,118 @@
   5      return-void
   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_3c
  12 +
  13 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
  14 +
  15 +    if-eqz v4, :cond_3c
  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_3c
  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_3d
  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_54
  59 +
  60 +    :cond_2a
  61 +    :goto_2a
  62 +    if-eqz v2, :cond_3c
  63 +
  64 +    const/4 v4, -0x1
  65 +
  66 +    if-eq v3, v4, :cond_3c
  67 +
  68 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
  69 +
  70 +    iget-object v5, p0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
  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_3c
  81 +    :goto_3c
  82 +    return-void
  83 +
  84 +    :cond_3d
  85 +    :try_start_3d
  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_53
 110 +    .catch Ljava/lang/Exception; {:try_start_3d .. :try_end_53} :catch_54
 111 +
 112 +    goto :goto_2a
 113 +
 114 +    :catch_54
 115 +    move-exception v1
 116 +
 117 +    goto :goto_3c
 118 +.end method
 119 +
 120  .method private final findAffinityTaskTopLocked(ILjava/lang/String;)I
 121      .registers 10
 122
 123 @@ -19095,7 +19207,7 @@
 124      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 125      :try_end_1e4
 126      .catchall {:try_start_1bd .. :try_end_1e4} :catchall_5f
 127 -    .catch Landroid/os/RemoteException; {:try_start_1bd .. :try_end_1e4} :catch_26e
 128 +    .catch Landroid/os/RemoteException; {:try_start_1bd .. :try_end_1e4} :catch_277
 129
 130      :cond_1e4
 131      :goto_1e4
 132 @@ -19193,11 +19305,19 @@
 133
 134      move-result-object v21
 135
 136 +    move-object/from16 v0, p0
 137 +
 138 +    move-object/from16 v1, v21
 139 +
 140 +    move-object/from16 v2, v26
 141 +
 142 +    invoke-direct {v0, v1, v2}, Lcom/android/server/am/ActivityManagerService;->enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
 143 +
 144      move-object/from16 v0, v21
 145
 146      instance-of v3, v0, Lcom/android/server/am/BroadcastFilter;
 147
 148 -    if-eqz v3, :cond_28d
 149 +    if-eqz v3, :cond_296
 150
 151      move-object/from16 v0, v21
 152
 153 @@ -19219,15 +19339,15 @@
 154
 155      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 156
 157 -    if-eqz v3, :cond_263
 158 +    if-eqz v3, :cond_26c
 159
 160      move-object/from16 v0, v26
 161
 162      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 163
 164 -    if-nez v3, :cond_26b
 165 +    if-nez v3, :cond_274
 166
 167 -    :cond_263
 168 +    :cond_26c
 169      const/4 v3, 0x0
 170
 171      move-object/from16 v0, v26
 172 @@ -19236,12 +19356,12 @@
 173
 174      invoke-direct/range {p0 .. p0}, Lcom/android/server/am/ActivityManagerService;->scheduleBroadcastsLocked()V
 175
 176 -    :cond_26b
 177 +    :cond_274
 178      monitor-exit p0
 179
 180      goto/16 :goto_85
 181
 182 -    :catch_26e
 183 +    :catch_277
 184      move-exception v14
 185
 186      const-string v3, "ActivityManager"
 187 @@ -19272,7 +19392,7 @@
 188
 189      goto/16 :goto_1e4
 190
 191 -    :cond_28d
 192 +    :cond_296
 193      move-object/from16 v0, v21
 194
 195      check-cast v0, Landroid/content/pm/ResolveInfo;
 196 @@ -19315,7 +19435,7 @@
 197
 198      move-result v25
 199
 200 -    if-eqz v25, :cond_345
 201 +    if-eqz v25, :cond_34e
 202
 203      move-object/from16 v0, v18
 204
 205 @@ -19323,7 +19443,7 @@
 206
 207      iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
 208
 209 -    if-nez v3, :cond_3f4
 210 +    if-nez v3, :cond_3fd
 211
 212      const-string v3, "ActivityManager"
 213
 214 @@ -19453,10 +19573,10 @@
 215
 216      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 217
 218 -    :goto_343
 219 +    :goto_34c
 220      const/16 v28, 0x1
 221
 222 -    :cond_345
 223 +    :cond_34e
 224      move-object/from16 v0, v18
 225
 226      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 227 @@ -19467,17 +19587,17 @@
 228
 229      const/16 v5, 0x3e8
 230
 231 -    if-eq v3, v5, :cond_3cd
 232 +    if-eq v3, v5, :cond_3d6
 233
 234      move-object/from16 v0, v26
 235
 236      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 237 -    :try_end_355
 238 -    .catchall {:try_start_1e4 .. :try_end_355} :catchall_5f
 239 +    :try_end_35e
 240 +    .catchall {:try_start_1e4 .. :try_end_35e} :catchall_5f
 241
 242 -    if-eqz v3, :cond_3cd
 243 +    if-eqz v3, :cond_3d6
 244
 245 -    :try_start_357
 246 +    :try_start_360
 247      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 248
 249      move-result-object v3
 250 @@ -19495,16 +19615,16 @@
 251      iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 252
 253      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
 254 -    :try_end_36a
 255 -    .catchall {:try_start_357 .. :try_end_36a} :catchall_5f
 256 -    .catch Landroid/os/RemoteException; {:try_start_357 .. :try_end_36a} :catch_476
 257 +    :try_end_373
 258 +    .catchall {:try_start_360 .. :try_end_373} :catchall_5f
 259 +    .catch Landroid/os/RemoteException; {:try_start_360 .. :try_end_373} :catch_47f
 260
 261      move-result v25
 262
 263 -    :goto_36b
 264 -    if-eqz v25, :cond_3cd
 265 +    :goto_374
 266 +    if-eqz v25, :cond_3d6
 267
 268 -    :try_start_36d
 269 +    :try_start_376
 270      const-string v3, "ActivityManager"
 271
 272      new-instance v5, Ljava/lang/StringBuilder;
 273 @@ -19599,12 +19719,12 @@
 274
 275      const/16 v28, 0x1
 276
 277 -    :cond_3cd
 278 +    :cond_3d6
 279      move-object/from16 v0, v26
 280
 281      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
 282
 283 -    if-eqz v3, :cond_3dd
 284 +    if-eqz v3, :cond_3e6
 285
 286      move-object/from16 v0, v26
 287
 288 @@ -19612,12 +19732,12 @@
 289
 290      iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
 291
 292 -    if-eqz v3, :cond_3dd
 293 +    if-eqz v3, :cond_3e6
 294
 295      const/16 v28, 0x1
 296
 297 -    :cond_3dd
 298 -    if-eqz v28, :cond_47b
 299 +    :cond_3e6
 300 +    if-eqz v28, :cond_484
 301
 302      const/4 v3, 0x0
 303
 304 @@ -19643,7 +19763,7 @@
 305
 306      goto/16 :goto_85
 307
 308 -    :cond_3f4
 309 +    :cond_3fd
 310      const-string v3, "ActivityManager"
 311
 312      new-instance v5, Ljava/lang/StringBuilder;
 313 @@ -19770,16 +19890,16 @@
 314
 315      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 316
 317 -    goto/16 :goto_343
 318 +    goto/16 :goto_34c
 319
 320 -    :catch_476
 321 +    :catch_47f
 322      move-exception v14
 323
 324      const/16 v25, -0x1
 325
 326 -    goto/16 :goto_36b
 327 +    goto/16 :goto_374
 328
 329 -    :cond_47b
 330 +    :cond_484
 331      const/4 v3, 0x1
 332
 333      move-object/from16 v0, v26
 334 @@ -19821,10 +19941,10 @@
 335      move-object/from16 v0, v26
 336
 337      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
 338 -    :try_end_4a5
 339 -    .catchall {:try_start_36d .. :try_end_4a5} :catchall_5f
 340 +    :try_end_4ae
 341 +    .catchall {:try_start_376 .. :try_end_4ae} :catchall_5f
 342
 343 -    :try_start_4a5
 344 +    :try_start_4ae
 345      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 346
 347      move-result-object v3
 348 @@ -19840,13 +19960,13 @@
 349      const/4 v6, 0x0
 350
 351      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;Z)V
 352 -    :try_end_4b5
 353 -    .catchall {:try_start_4a5 .. :try_end_4b5} :catchall_5f
 354 -    .catch Landroid/os/RemoteException; {:try_start_4a5 .. :try_end_4b5} :catch_5d9
 355 -    .catch Ljava/lang/IllegalArgumentException; {:try_start_4a5 .. :try_end_4b5} :catch_4dc
 356 +    :try_end_4be
 357 +    .catchall {:try_start_4ae .. :try_end_4be} :catchall_5f
 358 +    .catch Landroid/os/RemoteException; {:try_start_4ae .. :try_end_4be} :catch_5e2
 359 +    .catch Ljava/lang/IllegalArgumentException; {:try_start_4ae .. :try_end_4be} :catch_4e5
 360
 361 -    :goto_4b5
 362 -    :try_start_4b5
 363 +    :goto_4be
 364 +    :try_start_4be
 365      move-object/from16 v0, v18
 366
 367      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 368 @@ -19861,15 +19981,15 @@
 369
 370      move-result-object v13
 371
 372 -    if-eqz v13, :cond_525
 373 +    if-eqz v13, :cond_52e
 374
 375      iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
 376 -    :try_end_4c7
 377 -    .catchall {:try_start_4b5 .. :try_end_4c7} :catchall_5f
 378 +    :try_end_4d0
 379 +    .catchall {:try_start_4be .. :try_end_4d0} :catchall_5f
 380
 381 -    if-eqz v3, :cond_525
 382 +    if-eqz v3, :cond_52e
 383
 384 -    :try_start_4c9
 385 +    :try_start_4d2
 386      move-object/from16 v0, v18
 387
 388      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 389 @@ -19883,16 +20003,16 @@
 390      move-object/from16 v1, v26
 391
 392      invoke-direct {v0, v1, v13}, Lcom/android/server/am/ActivityManagerService;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
 393 -    :try_end_4d9
 394 -    .catchall {:try_start_4c9 .. :try_end_4d9} :catchall_5f
 395 -    .catch Landroid/os/RemoteException; {:try_start_4c9 .. :try_end_4d9} :catch_508
 396 +    :try_end_4e2
 397 +    .catchall {:try_start_4d2 .. :try_end_4e2} :catchall_5f
 398 +    .catch Landroid/os/RemoteException; {:try_start_4d2 .. :try_end_4e2} :catch_511
 399
 400 -    :try_start_4d9
 401 +    :try_start_4e2
 402      monitor-exit p0
 403
 404      goto/16 :goto_85
 405
 406 -    :catch_4dc
 407 +    :catch_4e5
 408      move-exception v14
 409
 410      const-string v3, "ActivityManager"
 411 @@ -19935,9 +20055,9 @@
 412
 413      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 414
 415 -    goto :goto_4b5
 416 +    goto :goto_4be
 417
 418 -    :catch_508
 419 +    :catch_511
 420      move-exception v14
 421
 422      const-string v3, "ActivityManager"
 423 @@ -19966,7 +20086,7 @@
 424
 425      invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 426
 427 -    :cond_525
 428 +    :cond_52e
 429      move-object/from16 v0, v18
 430
 431      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 432 @@ -20003,11 +20123,11 @@
 433
 434      and-int/2addr v3, v10
 435
 436 -    if-eqz v3, :cond_5c8
 437 +    if-eqz v3, :cond_5d1
 438
 439      const/4 v10, 0x1
 440
 441 -    :goto_54a
 442 +    :goto_553
 443      move-object/from16 v3, p0
 444
 445      invoke-virtual/range {v3 .. v10}, Lcom/android/server/am/ActivityManagerService;->startProcessLocked(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;ZILjava/lang/String;Landroid/content/ComponentName;Z)Lcom/android/server/am/ProcessRecord;
 446 @@ -20018,7 +20138,7 @@
 447
 448      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
 449
 450 -    if-nez v3, :cond_5ca
 451 +    if-nez v3, :cond_5d3
 452
 453      const-string v3, "ActivityManager"
 454
 455 @@ -20132,12 +20252,12 @@
 456
 457      goto/16 :goto_85
 458
 459 -    :cond_5c8
 460 +    :cond_5d1
 461      const/4 v10, 0x0
 462
 463 -    goto :goto_54a
 464 +    goto :goto_553
 465
 466 -    :cond_5ca
 467 +    :cond_5d3
 468      move-object/from16 v0, v26
 469
 470      move-object/from16 v1, p0
 471 @@ -20151,15 +20271,15 @@
 472      iput v0, v1, Lcom/android/server/am/ActivityManagerService;->mPendingBroadcastRecvIndex:I
 473
 474      monitor-exit p0
 475 -    :try_end_5d7
 476 -    .catchall {:try_start_4d9 .. :try_end_5d7} :catchall_5f
 477 +    :try_end_5e0
 478 +    .catchall {:try_start_4e2 .. :try_end_5e0} :catchall_5f
 479
 480      goto/16 :goto_85
 481
 482 -    :catch_5d9
 483 +    :catch_5e2
 484      move-exception v3
 485
 486 -    goto/16 :goto_4b5
 487 +    goto/16 :goto_4be
 488  .end method
 489
 490  .method private final processStartTimedOutLocked(Lcom/android/server/am/ProcessRecord;)V
 491 diff -Npru stock_services/smali/com/android/server/ServerThread.smali moded_services/smali/com/android/server/ServerThread.smali
 492 --- stock_services/smali/com/android/server/ServerThread.smali  2012-06-24 14:05:08.164160193 -0700
 493 +++ moded_services/smali/com/android/server/ServerThread.smali  2012-06-24 14:05:17.652416992 -0700
 494 @@ -24,6 +24,41 @@
 495      return-void
 496  .end method
 497
 498 +.method private addPrivacyService(Landroid/content/Context;)V
 499 +    .registers 5
 500 +
 501 +    :try_start_0
 502 +    const-string v1, "SystemServer"
 503 +
 504 +    const-string v2, "Privacy Service"
 505 +
 506 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 507 +
 508 +    const-string v1, "privacy"
 509 +
 510 +    new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
 511 +
 512 +    invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
 513 +
 514 +    invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 515 +    :try_end_11
 516 +    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
 517 +
 518 +    :goto_11
 519 +    return-void
 520 +
 521 +    :catch_12
 522 +    move-exception v0
 523 +
 524 +    const-string v1, "SystemServer"
 525 +
 526 +    const-string v2, "Failure starting Privacy Service"
 527 +
 528 +    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 529 +
 530 +    goto :goto_11
 531 +.end method
 532 +
 533  .method static final startSystemUi(Landroid/content/Context;)V
 534      .registers 5
 535
 536 @@ -155,7 +190,7 @@
 537
 538      const/16 v9, 0x31
 539
 540 -    if-ne v3, v9, :cond_53a
 541 +    if-ne v3, v9, :cond_53f
 542
 543      const/16 v77, 0x1
 544
 545 @@ -166,7 +201,7 @@
 546
 547      const/4 v9, 0x1
 548
 549 -    if-le v3, v9, :cond_53e
 550 +    if-le v3, v9, :cond_543
 551
 552      const/4 v3, 0x1
 553
 554 @@ -202,7 +237,7 @@
 555
 556      move-result v3
 557
 558 -    if-eqz v3, :cond_542
 559 +    if-eqz v3, :cond_547
 560
 561      const/16 v57, 0x0
 562
 563 @@ -274,7 +309,7 @@
 564
 565      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
 566      :try_end_a4
 567 -    .catch Ljava/lang/RuntimeException; {:try_start_87 .. :try_end_a4} :catch_813
 568 +    .catch Ljava/lang/RuntimeException; {:try_start_87 .. :try_end_a4} :catch_818
 569
 570      :try_start_a4
 571      const-string v3, "power"
 572 @@ -329,7 +364,7 @@
 573
 574      move-result v3
 575
 576 -    if-eqz v3, :cond_548
 577 +    if-eqz v3, :cond_54d
 578
 579      const-string v3, "SystemServer"
 580
 581 @@ -341,7 +376,7 @@
 582
 583      :cond_ea
 584      :goto_ea
 585 -    if-eqz v57, :cond_55d
 586 +    if-eqz v57, :cond_562
 587
 588      const/4 v3, 0x1
 589
 590 @@ -350,7 +385,7 @@
 591
 592      invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
 593      :try_end_f2
 594 -    .catch Ljava/lang/RuntimeException; {:try_start_a4 .. :try_end_f2} :catch_56c
 595 +    .catch Ljava/lang/RuntimeException; {:try_start_a4 .. :try_end_f2} :catch_571
 596
 597      move-result-object v74
 598
 599 @@ -359,8 +394,8 @@
 600      :try_start_f5
 601      invoke-interface/range {v74 .. v74}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
 602      :try_end_f8
 603 -    .catch Landroid/os/RemoteException; {:try_start_f5 .. :try_end_f8} :catch_7c0
 604 -    .catch Ljava/lang/RuntimeException; {:try_start_f5 .. :try_end_f8} :catch_56c
 605 +    .catch Landroid/os/RemoteException; {:try_start_f5 .. :try_end_f8} :catch_7c5
 606 +    .catch Ljava/lang/RuntimeException; {:try_start_f5 .. :try_end_f8} :catch_571
 607
 608      move-result v59
 609
 610 @@ -376,7 +411,7 @@
 611
 612      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
 613      :try_end_104
 614 -    .catch Ljava/lang/RuntimeException; {:try_start_f9 .. :try_end_104} :catch_56c
 615 +    .catch Ljava/lang/RuntimeException; {:try_start_f9 .. :try_end_104} :catch_571
 616
 617      :try_start_104
 618      const-string v3, "SystemServer"
 619 @@ -393,8 +428,8 @@
 620
 621      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 622      :try_end_115
 623 -    .catch Ljava/lang/Throwable; {:try_start_104 .. :try_end_115} :catch_560
 624 -    .catch Ljava/lang/RuntimeException; {:try_start_104 .. :try_end_115} :catch_56c
 625 +    .catch Ljava/lang/Throwable; {:try_start_104 .. :try_end_115} :catch_565
 626 +    .catch Ljava/lang/RuntimeException; {:try_start_104 .. :try_end_115} :catch_571
 627
 628      :goto_115
 629      :try_start_115
 630 @@ -408,13 +443,17 @@
 631
 632      move/from16 v0, v57
 633
 634 -    if-ne v0, v3, :cond_583
 635 +    if-ne v0, v3, :cond_588
 636
 637      const/4 v3, 0x1
 638
 639      :goto_122
 640      invoke-static {v4, v3}, Landroid/content/ContentService;->main(Landroid/content/Context;Z)Landroid/content/IContentService;
 641
 642 +    move-object/from16 v0, p0
 643 +
 644 +    invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
 645 +
 646      const-string v3, "SystemServer"
 647
 648      const-string v9, "System Content Providers"
 649 @@ -434,10 +473,10 @@
 650      move-object/from16 v0, v63
 651
 652      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
 653 -    :try_end_13d
 654 -    .catch Ljava/lang/RuntimeException; {:try_start_115 .. :try_end_13d} :catch_56c
 655 +    :try_end_142
 656 +    .catch Ljava/lang/RuntimeException; {:try_start_115 .. :try_end_142} :catch_571
 657
 658 -    :try_start_13d
 659 +    :try_start_142
 660      const-string v3, "SystemServer"
 661
 662      const-string v9, "Battery Service"
 663 @@ -449,10 +488,10 @@
 664      move-object/from16 v0, v63
 665
 666      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
 667 -    :try_end_14b
 668 -    .catch Ljava/lang/RuntimeException; {:try_start_13d .. :try_end_14b} :catch_81c
 669 +    :try_end_150
 670 +    .catch Ljava/lang/RuntimeException; {:try_start_142 .. :try_end_150} :catch_821
 671
 672 -    :try_start_14b
 673 +    :try_start_150
 674      const-string v3, "battery"
 675
 676      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 677 @@ -488,10 +527,10 @@
 678      new-instance v7, Lcom/android/server/AlarmManagerService;
 679
 680      invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
 681 -    :try_end_176
 682 -    .catch Ljava/lang/RuntimeException; {:try_start_14b .. :try_end_176} :catch_825
 683 +    :try_end_17b
 684 +    .catch Ljava/lang/RuntimeException; {:try_start_150 .. :try_end_17b} :catch_82a
 685
 686 -    :try_start_176
 687 +    :try_start_17b
 688      const-string v3, "alarm"
 689
 690      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 691 @@ -522,18 +561,18 @@
 692
 693      move/from16 v0, v57
 694
 695 -    if-eq v0, v3, :cond_586
 696 +    if-eq v0, v3, :cond_58b
 697
 698      const/4 v3, 0x1
 699
 700      move v9, v3
 701
 702 -    :goto_19b
 703 -    if-nez v59, :cond_58a
 704 +    :goto_1a0
 705 +    if-nez v59, :cond_58f
 706
 707      const/4 v3, 0x1
 708
 709 -    :goto_19e
 710 +    :goto_1a3
 711      invoke-static {v4, v6, v9, v3}, Lcom/android/server/wm/WindowManagerService;->main(Landroid/content/Context;Lcom/android/server/PowerManagerService;ZZ)Lcom/android/server/wm/WindowManagerService;
 712
 713      move-result-object v98
 714 @@ -564,20 +603,20 @@
 715
 716      move-result v3
 717
 718 -    if-eqz v3, :cond_58d
 719 +    if-eqz v3, :cond_592
 720
 721      const-string v3, "SystemServer"
 722
 723      const-string v9, "No Bluetooh Service (emulator)"
 724
 725      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
 726 -    :try_end_1c7
 727 -    .catch Ljava/lang/RuntimeException; {:try_start_176 .. :try_end_1c7} :catch_59b
 728 +    :try_end_1cc
 729 +    .catch Ljava/lang/RuntimeException; {:try_start_17b .. :try_end_1cc} :catch_5a0
 730
 731 -    :goto_1c7
 732 +    :goto_1cc
 733      move-object/from16 v62, v63
 734
 735 -    :goto_1c9
 736 +    :goto_1ce
 737      const/16 v52, 0x0
 738
 739      const/16 v81, 0x0
 740 @@ -600,9 +639,9 @@
 741
 742      move/from16 v0, v57
 743
 744 -    if-eq v0, v3, :cond_208
 745 +    if-eq v0, v3, :cond_20d
 746
 747 -    :try_start_1e0
 748 +    :try_start_1e5
 749      const-string v3, "SystemServer"
 750
 751      const-string v9, "Input Method Service"
 752 @@ -614,22 +653,22 @@
 753      move-object/from16 v0, v61
 754
 755      invoke-direct {v0, v4}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;)V
 756 -    :try_end_1ee
 757 -    .catch Ljava/lang/Throwable; {:try_start_1e0 .. :try_end_1ee} :catch_5ed
 758 +    :try_end_1f3
 759 +    .catch Ljava/lang/Throwable; {:try_start_1e5 .. :try_end_1f3} :catch_5f2
 760
 761 -    :try_start_1ee
 762 +    :try_start_1f3
 763      const-string v3, "input_method"
 764
 765      move-object/from16 v0, v61
 766
 767      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 768 -    :try_end_1f5
 769 -    .catch Ljava/lang/Throwable; {:try_start_1ee .. :try_end_1f5} :catch_80e
 770 +    :try_end_1fa
 771 +    .catch Ljava/lang/Throwable; {:try_start_1f3 .. :try_end_1fa} :catch_813
 772
 773      move-object/from16 v60, v61
 774
 775 -    :goto_1f7
 776 -    :try_start_1f7
 777 +    :goto_1fc
 778 +    :try_start_1fc
 779      const-string v3, "SystemServer"
 780
 781      const-string v9, "Accessibility Manager"
 782 @@ -643,24 +682,24 @@
 783      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
 784
 785      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 786 -    :try_end_208
 787 -    .catch Ljava/lang/Throwable; {:try_start_1f7 .. :try_end_208} :catch_5f9
 788 +    :try_end_20d
 789 +    .catch Ljava/lang/Throwable; {:try_start_1fc .. :try_end_20d} :catch_5fe
 790
 791 -    :cond_208
 792 -    :goto_208
 793 -    :try_start_208
 794 +    :cond_20d
 795 +    :goto_20d
 796 +    :try_start_20d
 797      invoke-virtual/range {v98 .. v98}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
 798 -    :try_end_20b
 799 -    .catch Ljava/lang/Throwable; {:try_start_208 .. :try_end_20b} :catch_605
 800 +    :try_end_210
 801 +    .catch Ljava/lang/Throwable; {:try_start_20d .. :try_end_210} :catch_60a
 802
 803 -    :goto_20b
 804 -    :try_start_20b
 805 +    :goto_210
 806 +    :try_start_210
 807      invoke-interface/range {v74 .. v74}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
 808 -    :try_end_20e
 809 -    .catch Ljava/lang/Throwable; {:try_start_20b .. :try_end_20e} :catch_611
 810 +    :try_end_213
 811 +    .catch Ljava/lang/Throwable; {:try_start_210 .. :try_end_213} :catch_616
 812
 813 -    :goto_20e
 814 -    :try_start_20e
 815 +    :goto_213
 816 +    :try_start_213
 817      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
 818
 819      move-result-object v3
 820 @@ -678,17 +717,17 @@
 821      const/4 v10, 0x0
 822
 823      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
 824 -    :try_end_221
 825 -    .catch Landroid/os/RemoteException; {:try_start_20e .. :try_end_221} :catch_80b
 826 +    :try_end_226
 827 +    .catch Landroid/os/RemoteException; {:try_start_213 .. :try_end_226} :catch_810
 828
 829 -    :goto_221
 830 +    :goto_226
 831      const/4 v3, 0x1
 832
 833      move/from16 v0, v57
 834
 835 -    if-eq v0, v3, :cond_83c
 836 +    if-eq v0, v3, :cond_841
 837
 838 -    :try_start_226
 839 +    :try_start_22b
 840      const-string v3, "SystemServer"
 841
 842      const-string v9, "Device Policy"
 843 @@ -700,22 +739,22 @@
 844      move-object/from16 v0, v53
 845
 846      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
 847 -    :try_end_234
 848 -    .catch Ljava/lang/Throwable; {:try_start_226 .. :try_end_234} :catch_61d
 849 +    :try_end_239
 850 +    .catch Ljava/lang/Throwable; {:try_start_22b .. :try_end_239} :catch_622
 851
 852 -    :try_start_234
 853 +    :try_start_239
 854      const-string v3, "device_policy"
 855
 856      move-object/from16 v0, v53
 857
 858      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 859 -    :try_end_23b
 860 -    .catch Ljava/lang/Throwable; {:try_start_234 .. :try_end_23b} :catch_806
 861 +    :try_end_240
 862 +    .catch Ljava/lang/Throwable; {:try_start_239 .. :try_end_240} :catch_80b
 863
 864      move-object/from16 v52, v53
 865
 866 -    :goto_23d
 867 -    :try_start_23d
 868 +    :goto_242
 869 +    :try_start_242
 870      const-string v3, "SystemServer"
 871
 872      const-string v9, "Status Bar"
 873 @@ -729,22 +768,22 @@
 874      move-object/from16 v1, v98
 875
 876      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
 877 -    :try_end_24d
 878 -    .catch Ljava/lang/Throwable; {:try_start_23d .. :try_end_24d} :catch_629
 879 +    :try_end_252
 880 +    .catch Ljava/lang/Throwable; {:try_start_242 .. :try_end_252} :catch_62e
 881
 882 -    :try_start_24d
 883 +    :try_start_252
 884      const-string v3, "statusbar"
 885
 886      move-object/from16 v0, v82
 887
 888      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 889 -    :try_end_254
 890 -    .catch Ljava/lang/Throwable; {:try_start_24d .. :try_end_254} :catch_801
 891 +    :try_end_259
 892 +    .catch Ljava/lang/Throwable; {:try_start_252 .. :try_end_259} :catch_806
 893
 894      move-object/from16 v81, v82
 895
 896 -    :goto_256
 897 -    :try_start_256
 898 +    :goto_25b
 899 +    :try_start_25b
 900      const-string v3, "SystemServer"
 901
 902      const-string v9, "Clipboard Service"
 903 @@ -758,11 +797,11 @@
 904      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
 905
 906      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 907 -    :try_end_267
 908 -    .catch Ljava/lang/Throwable; {:try_start_256 .. :try_end_267} :catch_635
 909 +    :try_end_26c
 910 +    .catch Ljava/lang/Throwable; {:try_start_25b .. :try_end_26c} :catch_63a
 911
 912 -    :goto_267
 913 -    :try_start_267
 914 +    :goto_26c
 915 +    :try_start_26c
 916      const-string v3, "SystemServer"
 917
 918      const-string v9, "NetworkManagement Service"
 919 @@ -776,11 +815,11 @@
 920      const-string v3, "network_management"
 921
 922      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 923 -    :try_end_277
 924 -    .catch Ljava/lang/Throwable; {:try_start_267 .. :try_end_277} :catch_641
 925 +    :try_end_27c
 926 +    .catch Ljava/lang/Throwable; {:try_start_26c .. :try_end_27c} :catch_646
 927
 928 -    :goto_277
 929 -    :try_start_277
 930 +    :goto_27c
 931 +    :try_start_27c
 932      const-string v3, "SystemServer"
 933
 934      const-string v9, "Text Service Manager Service"
 935 @@ -792,22 +831,22 @@
 936      move-object/from16 v0, v86
 937
 938      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
 939 -    :try_end_285
 940 -    .catch Ljava/lang/Throwable; {:try_start_277 .. :try_end_285} :catch_64d
 941 +    :try_end_28a
 942 +    .catch Ljava/lang/Throwable; {:try_start_27c .. :try_end_28a} :catch_652
 943
 944 -    :try_start_285
 945 +    :try_start_28a
 946      const-string v3, "textservices"
 947
 948      move-object/from16 v0, v86
 949
 950      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 951 -    :try_end_28c
 952 -    .catch Ljava/lang/Throwable; {:try_start_285 .. :try_end_28c} :catch_7fc
 953 +    :try_end_291
 954 +    .catch Ljava/lang/Throwable; {:try_start_28a .. :try_end_291} :catch_801
 955
 956      move-object/from16 v85, v86
 957
 958 -    :goto_28e
 959 -    :try_start_28e
 960 +    :goto_293
 961 +    :try_start_293
 962      const-string v3, "SystemServer"
 963
 964      const-string v9, "NetworkStats Service"
 965 @@ -819,22 +858,22 @@
 966      move-object/from16 v0, v68
 967
 968      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
 969 -    :try_end_29c
 970 -    .catch Ljava/lang/Throwable; {:try_start_28e .. :try_end_29c} :catch_659
 971 +    :try_end_2a1
 972 +    .catch Ljava/lang/Throwable; {:try_start_293 .. :try_end_2a1} :catch_65e
 973
 974 -    :try_start_29c
 975 +    :try_start_2a1
 976      const-string v3, "netstats"
 977
 978      move-object/from16 v0, v68
 979
 980      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 981 -    :try_end_2a3
 982 -    .catch Ljava/lang/Throwable; {:try_start_29c .. :try_end_2a3} :catch_7f7
 983 +    :try_end_2a8
 984 +    .catch Ljava/lang/Throwable; {:try_start_2a1 .. :try_end_2a8} :catch_7fc
 985
 986      move-object/from16 v12, v68
 987
 988 -    :goto_2a5
 989 -    :try_start_2a5
 990 +    :goto_2aa
 991 +    :try_start_2aa
 992      const-string v3, "SystemServer"
 993
 994      const-string v9, "NetworkPolicy Service"
 995 @@ -852,18 +891,18 @@
 996      move-object v11, v6
 997
 998      invoke-direct/range {v8 .. v13}, Lcom/android/server/net/NetworkPolicyManagerService;-><init>(Landroid/content/Context;Landroid/app/IActivityManager;Landroid/os/IPowerManager;Landroid/net/INetworkStatsService;Landroid/os/INetworkManagementService;)V
 999 -    :try_end_2b7
1000 -    .catch Ljava/lang/Throwable; {:try_start_2a5 .. :try_end_2b7} :catch_665
1001 +    :try_end_2bc
1002 +    .catch Ljava/lang/Throwable; {:try_start_2aa .. :try_end_2bc} :catch_66a
1003
1004 -    :try_start_2b7
1005 +    :try_start_2bc
1006      const-string v3, "netpolicy"
1007
1008      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1009 -    :try_end_2bc
1010 -    .catch Ljava/lang/Throwable; {:try_start_2b7 .. :try_end_2bc} :catch_7f4
1011 +    :try_end_2c1
1012 +    .catch Ljava/lang/Throwable; {:try_start_2bc .. :try_end_2c1} :catch_7f9
1013
1014 -    :goto_2bc
1015 -    :try_start_2bc
1016 +    :goto_2c1
1017 +    :try_start_2c1
1018      const-string v3, "SystemServer"
1019
1020      const-string v9, "Wi-Fi P2pService"
1021 @@ -875,22 +914,22 @@
1022      move-object/from16 v0, v97
1023
1024      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
1025 -    :try_end_2ca
1026 -    .catch Ljava/lang/Throwable; {:try_start_2bc .. :try_end_2ca} :catch_673
1027 +    :try_end_2cf
1028 +    .catch Ljava/lang/Throwable; {:try_start_2c1 .. :try_end_2cf} :catch_678
1029
1030 -    :try_start_2ca
1031 +    :try_start_2cf
1032      const-string v3, "wifip2p"
1033
1034      move-object/from16 v0, v97
1035
1036      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1037 -    :try_end_2d1
1038 -    .catch Ljava/lang/Throwable; {:try_start_2ca .. :try_end_2d1} :catch_7ef
1039 +    :try_end_2d6
1040 +    .catch Ljava/lang/Throwable; {:try_start_2cf .. :try_end_2d6} :catch_7f4
1041
1042      move-object/from16 v96, v97
1043
1044 -    :goto_2d3
1045 -    :try_start_2d3
1046 +    :goto_2d8
1047 +    :try_start_2d8
1048      const-string v3, "SystemServer"
1049
1050      const-string v9, "Wi-Fi Service"
1051 @@ -902,22 +941,22 @@
1052      move-object/from16 v0, v95
1053
1054      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
1055 -    :try_end_2e1
1056 -    .catch Ljava/lang/Throwable; {:try_start_2d3 .. :try_end_2e1} :catch_67f
1057 +    :try_end_2e6
1058 +    .catch Ljava/lang/Throwable; {:try_start_2d8 .. :try_end_2e6} :catch_684
1059
1060 -    :try_start_2e1
1061 +    :try_start_2e6
1062      const-string v3, "wifi"
1063
1064      move-object/from16 v0, v95
1065
1066      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1067 -    :try_end_2e8
1068 -    .catch Ljava/lang/Throwable; {:try_start_2e1 .. :try_end_2e8} :catch_7ea
1069 +    :try_end_2ed
1070 +    .catch Ljava/lang/Throwable; {:try_start_2e6 .. :try_end_2ed} :catch_7ef
1071
1072      move-object/from16 v94, v95
1073
1074 -    :goto_2ea
1075 -    :try_start_2ea
1076 +    :goto_2ef
1077 +    :try_start_2ef
1078      const-string v3, "SystemServer"
1079
1080      const-string v9, "Connectivity Service"
1081 @@ -929,10 +968,10 @@
1082      move-object/from16 v0, v48
1083
1084      invoke-direct {v0, v4, v13, v12, v8}, Lcom/android/server/ConnectivityService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/net/INetworkStatsService;Landroid/net/INetworkPolicyManager;)V
1085 -    :try_end_2f8
1086 -    .catch Ljava/lang/Throwable; {:try_start_2ea .. :try_end_2f8} :catch_68b
1087 +    :try_end_2fd
1088 +    .catch Ljava/lang/Throwable; {:try_start_2ef .. :try_end_2fd} :catch_690
1089
1090 -    :try_start_2f8
1091 +    :try_start_2fd
1092      const-string v3, "connectivity"
1093
1094      move-object/from16 v0, v48
1095 @@ -950,13 +989,13 @@
1096      invoke-virtual/range {v94 .. v94}, Lcom/android/server/WifiService;->checkAndStartWifi()V
1097
1098      invoke-virtual/range {v96 .. v96}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
1099 -    :try_end_30f
1100 -    .catch Ljava/lang/Throwable; {:try_start_2f8 .. :try_end_30f} :catch_7e5
1101 +    :try_end_314
1102 +    .catch Ljava/lang/Throwable; {:try_start_2fd .. :try_end_314} :catch_7ea
1103
1104      move-object/from16 v47, v48
1105
1106 -    :goto_311
1107 -    :try_start_311
1108 +    :goto_316
1109 +    :try_start_316
1110      const-string v3, "SystemServer"
1111
1112      const-string v9, "Throttle Service"
1113 @@ -968,22 +1007,22 @@
1114      move-object/from16 v0, v84
1115
1116      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
1117 -    :try_end_31f
1118 -    .catch Ljava/lang/Throwable; {:try_start_311 .. :try_end_31f} :catch_697
1119 +    :try_end_324
1120 +    .catch Ljava/lang/Throwable; {:try_start_316 .. :try_end_324} :catch_69c
1121
1122 -    :try_start_31f
1123 +    :try_start_324
1124      const-string v3, "throttle"
1125
1126      move-object/from16 v0, v84
1127
1128      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1129 -    :try_end_326
1130 -    .catch Ljava/lang/Throwable; {:try_start_31f .. :try_end_326} :catch_7e0
1131 +    :try_end_32b
1132 +    .catch Ljava/lang/Throwable; {:try_start_324 .. :try_end_32b} :catch_7e5
1133
1134      move-object/from16 v83, v84
1135
1136 -    :goto_328
1137 -    :try_start_328
1138 +    :goto_32d
1139 +    :try_start_32d
1140      const-string v3, "SystemServer"
1141
1142      const-string v9, "Mount Service"
1143 @@ -997,11 +1036,11 @@
1144      invoke-direct {v9, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
1145
1146      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1147 -    :try_end_339
1148 -    .catch Ljava/lang/Throwable; {:try_start_328 .. :try_end_339} :catch_6a3
1149 +    :try_end_33e
1150 +    .catch Ljava/lang/Throwable; {:try_start_32d .. :try_end_33e} :catch_6a8
1151
1152 -    :goto_339
1153 -    :try_start_339
1154 +    :goto_33e
1155 +    :try_start_33e
1156      const-string v3, "SystemServer"
1157
1158      const-string v9, "Notification Manager"
1159 @@ -1017,10 +1056,10 @@
1160      move-object/from16 v2, v62
1161
1162      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
1163 -    :try_end_34b
1164 -    .catch Ljava/lang/Throwable; {:try_start_339 .. :try_end_34b} :catch_6af
1165 +    :try_end_350
1166 +    .catch Ljava/lang/Throwable; {:try_start_33e .. :try_end_350} :catch_6b4
1167
1168 -    :try_start_34b
1169 +    :try_start_350
1170      const-string v3, "notification"
1171
1172      move-object/from16 v0, v72
1173 @@ -1030,13 +1069,13 @@
1174      move-object/from16 v0, v72
1175
1176      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
1177 -    :try_end_357
1178 -    .catch Ljava/lang/Throwable; {:try_start_34b .. :try_end_357} :catch_7db
1179 +    :try_end_35c
1180 +    .catch Ljava/lang/Throwable; {:try_start_350 .. :try_end_35c} :catch_7e0
1181
1182      move-object/from16 v71, v72
1183
1184 -    :goto_359
1185 -    :try_start_359
1186 +    :goto_35e
1187 +    :try_start_35e
1188      const-string v3, "SystemServer"
1189
1190      const-string v9, "Device Storage Monitor"
1191 @@ -1050,11 +1089,11 @@
1192      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
1193
1194      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1195 -    :try_end_36a
1196 -    .catch Ljava/lang/Throwable; {:try_start_359 .. :try_end_36a} :catch_6bb
1197 +    :try_end_36f
1198 +    .catch Ljava/lang/Throwable; {:try_start_35e .. :try_end_36f} :catch_6c0
1199
1200 -    :goto_36a
1201 -    :try_start_36a
1202 +    :goto_36f
1203 +    :try_start_36f
1204      const-string v3, "SystemServer"
1205
1206      const-string v9, "Location Manager"
1207 @@ -1066,22 +1105,22 @@
1208      move-object/from16 v0, v65
1209
1210      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
1211 -    :try_end_378
1212 -    .catch Ljava/lang/Throwable; {:try_start_36a .. :try_end_378} :catch_6c7
1213 +    :try_end_37d
1214 +    .catch Ljava/lang/Throwable; {:try_start_36f .. :try_end_37d} :catch_6cc
1215
1216 -    :try_start_378
1217 +    :try_start_37d
1218      const-string v3, "location"
1219
1220      move-object/from16 v0, v65
1221
1222      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1223 -    :try_end_37f
1224 -    .catch Ljava/lang/Throwable; {:try_start_378 .. :try_end_37f} :catch_7d6
1225 +    :try_end_384
1226 +    .catch Ljava/lang/Throwable; {:try_start_37d .. :try_end_384} :catch_7db
1227
1228      move-object/from16 v64, v65
1229
1230 -    :goto_381
1231 -    :try_start_381
1232 +    :goto_386
1233 +    :try_start_386
1234      const-string v3, "SystemServer"
1235
1236      const-string v9, "Country Detector"
1237 @@ -1093,22 +1132,22 @@
1238      move-object/from16 v0, v50
1239
1240      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
1241 -    :try_end_38f
1242 -    .catch Ljava/lang/Throwable; {:try_start_381 .. :try_end_38f} :catch_6d3
1243 +    :try_end_394
1244 +    .catch Ljava/lang/Throwable; {:try_start_386 .. :try_end_394} :catch_6d8
1245
1246 -    :try_start_38f
1247 +    :try_start_394
1248      const-string v3, "country_detector"
1249
1250      move-object/from16 v0, v50
1251
1252      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1253 -    :try_end_396
1254 -    .catch Ljava/lang/Throwable; {:try_start_38f .. :try_end_396} :catch_7d1
1255 +    :try_end_39b
1256 +    .catch Ljava/lang/Throwable; {:try_start_394 .. :try_end_39b} :catch_7d6
1257
1258      move-object/from16 v49, v50
1259
1260 -    :goto_398
1261 -    :try_start_398
1262 +    :goto_39d
1263 +    :try_start_39d
1264      const-string v3, "SystemServer"
1265
1266      const-string v9, "Search Service"
1267 @@ -1122,11 +1161,11 @@
1268      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
1269
1270      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1271 -    :try_end_3a9
1272 -    .catch Ljava/lang/Throwable; {:try_start_398 .. :try_end_3a9} :catch_6df
1273 +    :try_end_3ae
1274 +    .catch Ljava/lang/Throwable; {:try_start_39d .. :try_end_3ae} :catch_6e4
1275
1276 -    :goto_3a9
1277 -    :try_start_3a9
1278 +    :goto_3ae
1279 +    :try_start_3ae
1280      const-string v3, "SystemServer"
1281
1282      const-string v9, "DropBox Service"
1283 @@ -1146,11 +1185,11 @@
1284      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
1285
1286      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1287 -    :try_end_3c1
1288 -    .catch Ljava/lang/Throwable; {:try_start_3a9 .. :try_end_3c1} :catch_6eb
1289 +    :try_end_3c6
1290 +    .catch Ljava/lang/Throwable; {:try_start_3ae .. :try_end_3c6} :catch_6f0
1291
1292 -    :goto_3c1
1293 -    :try_start_3c1
1294 +    :goto_3c6
1295 +    :try_start_3c6
1296      const-string v3, "SystemServer"
1297
1298      const-string v9, "Wallpaper Service"
1299 @@ -1162,22 +1201,22 @@
1300      move-object/from16 v0, v93
1301
1302      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
1303 -    :try_end_3cf
1304 -    .catch Ljava/lang/Throwable; {:try_start_3c1 .. :try_end_3cf} :catch_6f7
1305 +    :try_end_3d4
1306 +    .catch Ljava/lang/Throwable; {:try_start_3c6 .. :try_end_3d4} :catch_6fc
1307
1308 -    :try_start_3cf
1309 +    :try_start_3d4
1310      const-string v3, "wallpaper"
1311
1312      move-object/from16 v0, v93
1313
1314      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1315 -    :try_end_3d6
1316 -    .catch Ljava/lang/Throwable; {:try_start_3cf .. :try_end_3d6} :catch_7cc
1317 +    :try_end_3db
1318 +    .catch Ljava/lang/Throwable; {:try_start_3d4 .. :try_end_3db} :catch_7d1
1319
1320      move-object/from16 v92, v93
1321
1322 -    :goto_3d8
1323 -    :try_start_3d8
1324 +    :goto_3dd
1325 +    :try_start_3dd
1326      const-string v3, "SystemServer"
1327
1328      const-string v9, "Audio Service"
1329 @@ -1191,11 +1230,11 @@
1330      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
1331
1332      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1333 -    :try_end_3e9
1334 -    .catch Ljava/lang/Throwable; {:try_start_3d8 .. :try_end_3e9} :catch_703
1335 +    :try_end_3ee
1336 +    .catch Ljava/lang/Throwable; {:try_start_3dd .. :try_end_3ee} :catch_708
1337
1338 -    :goto_3e9
1339 -    :try_start_3e9
1340 +    :goto_3ee
1341 +    :try_start_3ee
1342      const-string v3, "SystemServer"
1343
1344      const-string v9, "Dock Observer"
1345 @@ -1207,13 +1246,13 @@
1346      move-object/from16 v0, v55
1347
1348      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
1349 -    :try_end_3f7
1350 -    .catch Ljava/lang/Throwable; {:try_start_3e9 .. :try_end_3f7} :catch_70f
1351 +    :try_end_3fc
1352 +    .catch Ljava/lang/Throwable; {:try_start_3ee .. :try_end_3fc} :catch_714
1353
1354      move-object/from16 v54, v55
1355
1356 -    :goto_3f9
1357 -    :try_start_3f9
1358 +    :goto_3fe
1359 +    :try_start_3fe
1360      const-string v3, "SystemServer"
1361
1362      const-string v9, "Wired Accessory Observer"
1363 @@ -1223,11 +1262,11 @@
1364      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
1365
1366      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
1367 -    :try_end_405
1368 -    .catch Ljava/lang/Throwable; {:try_start_3f9 .. :try_end_405} :catch_71b
1369 +    :try_end_40a
1370 +    .catch Ljava/lang/Throwable; {:try_start_3fe .. :try_end_40a} :catch_720
1371
1372 -    :goto_405
1373 -    :try_start_405
1374 +    :goto_40a
1375 +    :try_start_40a
1376      const-string v3, "SystemServer"
1377
1378      const-string v9, "USB Service"
1379 @@ -1239,22 +1278,22 @@
1380      move-object/from16 v0, v90
1381
1382      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
1383 -    :try_end_413
1384 -    .catch Ljava/lang/Throwable; {:try_start_405 .. :try_end_413} :catch_727
1385 +    :try_end_418
1386 +    .catch Ljava/lang/Throwable; {:try_start_40a .. :try_end_418} :catch_72c
1387
1388 -    :try_start_413
1389 +    :try_start_418
1390      const-string v3, "usb"
1391
1392      move-object/from16 v0, v90
1393
1394      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1395 -    :try_end_41a
1396 -    .catch Ljava/lang/Throwable; {:try_start_413 .. :try_end_41a} :catch_7c7
1397 +    :try_end_41f
1398 +    .catch Ljava/lang/Throwable; {:try_start_418 .. :try_end_41f} :catch_7cc
1399
1400      move-object/from16 v89, v90
1401
1402 -    :goto_41c
1403 -    :try_start_41c
1404 +    :goto_421
1405 +    :try_start_421
1406      const-string v3, "SystemServer"
1407
1408      const-string v9, "UI Mode Manager Service"
1409 @@ -1266,13 +1305,13 @@
1410      move-object/from16 v0, v88
1411
1412      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
1413 -    :try_end_42a
1414 -    .catch Ljava/lang/Throwable; {:try_start_41c .. :try_end_42a} :catch_733
1415 +    :try_end_42f
1416 +    .catch Ljava/lang/Throwable; {:try_start_421 .. :try_end_42f} :catch_738
1417
1418      move-object/from16 v87, v88
1419
1420 -    :goto_42c
1421 -    :try_start_42c
1422 +    :goto_431
1423 +    :try_start_431
1424      const-string v3, "SystemServer"
1425
1426      const-string v9, "Backup Service"
1427 @@ -1286,11 +1325,11 @@
1428      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
1429
1430      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1431 -    :try_end_43d
1432 -    .catch Ljava/lang/Throwable; {:try_start_42c .. :try_end_43d} :catch_73f
1433 +    :try_end_442
1434 +    .catch Ljava/lang/Throwable; {:try_start_431 .. :try_end_442} :catch_744
1435
1436 -    :goto_43d
1437 -    :try_start_43d
1438 +    :goto_442
1439 +    :try_start_442
1440      const-string v3, "SystemServer"
1441
1442      const-string v9, "AppWidget Service"
1443 @@ -1302,22 +1341,22 @@
1444      move-object/from16 v0, v39
1445
1446      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
1447 -    :try_end_44b
1448 -    .catch Ljava/lang/Throwable; {:try_start_43d .. :try_end_44b} :catch_74b
1449 +    :try_end_450
1450 +    .catch Ljava/lang/Throwable; {:try_start_442 .. :try_end_450} :catch_750
1451
1452 -    :try_start_44b
1453 +    :try_start_450
1454      const-string v3, "appwidget"
1455
1456      move-object/from16 v0, v39
1457
1458      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1459 -    :try_end_452
1460 -    .catch Ljava/lang/Throwable; {:try_start_44b .. :try_end_452} :catch_7c3
1461 +    :try_end_457
1462 +    .catch Ljava/lang/Throwable; {:try_start_450 .. :try_end_457} :catch_7c8
1463
1464      move-object/from16 v38, v39
1465
1466 -    :goto_454
1467 -    :try_start_454
1468 +    :goto_459
1469 +    :try_start_459
1470      const-string v3, "SystemServer"
1471
1472      const-string v9, "Recognition Service"
1473 @@ -1329,13 +1368,13 @@
1474      move-object/from16 v0, v79
1475
1476      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
1477 -    :try_end_462
1478 -    .catch Ljava/lang/Throwable; {:try_start_454 .. :try_end_462} :catch_757
1479 +    :try_end_467
1480 +    .catch Ljava/lang/Throwable; {:try_start_459 .. :try_end_467} :catch_75c
1481
1482      move-object/from16 v78, v79
1483
1484 -    :goto_464
1485 -    :try_start_464
1486 +    :goto_469
1487 +    :try_start_469
1488      const-string v3, "SystemServer"
1489
1490      const-string v9, "DiskStats Service"
1491 @@ -1349,11 +1388,11 @@
1492      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
1493
1494      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1495 -    :try_end_475
1496 -    .catch Ljava/lang/Throwable; {:try_start_464 .. :try_end_475} :catch_763
1497 +    :try_end_47a
1498 +    .catch Ljava/lang/Throwable; {:try_start_469 .. :try_end_47a} :catch_768
1499
1500 -    :goto_475
1501 -    :try_start_475
1502 +    :goto_47a
1503 +    :try_start_47a
1504      const-string v3, "SystemServer"
1505
1506      const-string v9, "SamplingProfiler Service"
1507 @@ -1367,11 +1406,11 @@
1508      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
1509
1510      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1511 -    :try_end_486
1512 -    .catch Ljava/lang/Throwable; {:try_start_475 .. :try_end_486} :catch_76f
1513 +    :try_end_48b
1514 +    .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_48b} :catch_774
1515
1516 -    :goto_486
1517 -    :try_start_486
1518 +    :goto_48b
1519 +    :try_start_48b
1520      const-string v3, "SystemServer"
1521
1522      const-string v9, "NetworkTimeUpdateService"
1523 @@ -1383,17 +1422,17 @@
1524      move-object/from16 v0, v70
1525
1526      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
1527 -    :try_end_494
1528 -    .catch Ljava/lang/Throwable; {:try_start_486 .. :try_end_494} :catch_77b
1529 +    :try_end_499
1530 +    .catch Ljava/lang/Throwable; {:try_start_48b .. :try_end_499} :catch_780
1531
1532      move-object/from16 v69, v70
1533
1534 -    :goto_496
1535 +    :goto_49b
1536      invoke-virtual/range {v98 .. v98}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
1537
1538      move-result v27
1539
1540 -    if-eqz v27, :cond_787
1541 +    if-eqz v27, :cond_78c
1542
1543      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
1544
1545 @@ -1411,32 +1450,32 @@
1546
1547      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
1548
1549 -    :goto_4ad
1550 -    if-eqz v52, :cond_4b2
1551 -
1552 -    :try_start_4af
1553 -    invoke-virtual/range {v52 .. v52}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
1554 -    :try_end_4b2
1555 -    .catch Ljava/lang/Throwable; {:try_start_4af .. :try_end_4b2} :catch_790
1556 -
1557 -    :cond_4b2
1558      :goto_4b2
1559 -    if-eqz v71, :cond_4b7
1560 +    if-eqz v52, :cond_4b7
1561
1562      :try_start_4b4
1563 -    invoke-virtual/range {v71 .. v71}, Lcom/android/server/NotificationManagerService;->systemReady()V
1564 +    invoke-virtual/range {v52 .. v52}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
1565      :try_end_4b7
1566 -    .catch Ljava/lang/Throwable; {:try_start_4b4 .. :try_end_4b7} :catch_79c
1567 +    .catch Ljava/lang/Throwable; {:try_start_4b4 .. :try_end_4b7} :catch_795
1568
1569      :cond_4b7
1570      :goto_4b7
1571 -    :try_start_4b7
1572 +    if-eqz v71, :cond_4bc
1573 +
1574 +    :try_start_4b9
1575 +    invoke-virtual/range {v71 .. v71}, Lcom/android/server/NotificationManagerService;->systemReady()V
1576 +    :try_end_4bc
1577 +    .catch Ljava/lang/Throwable; {:try_start_4b9 .. :try_end_4bc} :catch_7a1
1578 +
1579 +    :cond_4bc
1580 +    :goto_4bc
1581 +    :try_start_4bc
1582      invoke-virtual/range {v98 .. v98}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
1583 -    :try_end_4ba
1584 -    .catch Ljava/lang/Throwable; {:try_start_4b7 .. :try_end_4ba} :catch_7a8
1585 +    :try_end_4bf
1586 +    .catch Ljava/lang/Throwable; {:try_start_4bc .. :try_end_4bf} :catch_7ad
1587
1588 -    :goto_4ba
1589 -    if-eqz v27, :cond_4c3
1590 +    :goto_4bf
1591 +    if-eqz v27, :cond_4c8
1592
1593      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
1594
1595 @@ -1444,7 +1483,7 @@
1596
1597      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
1598
1599 -    :cond_4c3
1600 +    :cond_4c8
1601      invoke-virtual/range {v98 .. v98}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
1602
1603      move-result-object v46
1604 @@ -1481,12 +1520,12 @@
1605
1606      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
1607
1608 -    :try_start_4eb
1609 +    :try_start_4f0
1610      invoke-interface/range {v74 .. v74}, Landroid/content/pm/IPackageManager;->systemReady()V
1611 -    :try_end_4ee
1612 -    .catch Ljava/lang/Throwable; {:try_start_4eb .. :try_end_4ee} :catch_7b4
1613 +    :try_end_4f3
1614 +    .catch Ljava/lang/Throwable; {:try_start_4f0 .. :try_end_4f3} :catch_7b9
1615
1616 -    :goto_4ee
1617 +    :goto_4f3
1618      move-object/from16 v16, v4
1619
1620      move-object/from16 v17, v5
1621 @@ -1541,7 +1580,7 @@
1622
1623      move-result v3
1624
1625 -    if-eqz v3, :cond_52f
1626 +    if-eqz v3, :cond_534
1627
1628      const-string v3, "SystemServer"
1629
1630 @@ -1549,7 +1588,7 @@
1631
1632      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1633
1634 -    :cond_52f
1635 +    :cond_534
1636      invoke-static {}, Landroid/os/Looper;->loop()V
1637
1638      const-string v3, "SystemServer"
1639 @@ -1560,25 +1599,25 @@
1640
1641      return-void
1642
1643 -    :cond_53a
1644 +    :cond_53f
1645      const/16 v77, 0x0
1646
1647      goto/16 :goto_35
1648
1649 -    :cond_53e
1650 +    :cond_543
1651      const/16 v76, 0x0
1652
1653      goto/16 :goto_47
1654
1655 -    :cond_542
1656 +    :cond_547
1657      invoke-static/range {v58 .. v58}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
1658
1659      move-result v57
1660
1661      goto/16 :goto_60
1662
1663 -    :cond_548
1664 -    :try_start_548
1665 +    :cond_54d
1666 +    :try_start_54d
1667      const-string v3, "1"
1668
1669      move-object/from16 v0, v51
1670 @@ -1599,12 +1638,12 @@
1671
1672      goto/16 :goto_ea
1673
1674 -    :cond_55d
1675 +    :cond_562
1676      const/4 v3, 0x0
1677
1678      goto/16 :goto_ed
1679
1680 -    :catch_560
1681 +    :catch_565
1682      move-exception v56
1683
1684      const-string v3, "SystemServer"
1685 @@ -1614,19 +1653,19 @@
1686      move-object/from16 v0, v56
1687
1688      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1689 -    :try_end_56a
1690 -    .catch Ljava/lang/RuntimeException; {:try_start_548 .. :try_end_56a} :catch_56c
1691 +    :try_end_56f
1692 +    .catch Ljava/lang/RuntimeException; {:try_start_54d .. :try_end_56f} :catch_571
1693
1694      goto/16 :goto_115
1695
1696 -    :catch_56c
1697 +    :catch_571
1698      move-exception v56
1699
1700      move-object/from16 v7, v37
1701
1702      move-object/from16 v5, v40
1703
1704 -    :goto_571
1705 +    :goto_576
1706      const-string v3, "System"
1707
1708      const-string v9, "******************************************"
1709 @@ -1641,49 +1680,49 @@
1710
1711      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1712
1713 -    goto/16 :goto_1c9
1714 +    goto/16 :goto_1ce
1715
1716 -    :cond_583
1717 +    :cond_588
1718      const/4 v3, 0x0
1719
1720      goto/16 :goto_122
1721
1722 -    :cond_586
1723 +    :cond_58b
1724      const/4 v3, 0x0
1725
1726      move v9, v3
1727
1728 -    goto/16 :goto_19b
1729 +    goto/16 :goto_1a0
1730
1731 -    :cond_58a
1732 +    :cond_58f
1733      const/4 v3, 0x0
1734
1735 -    goto/16 :goto_19e
1736 +    goto/16 :goto_1a3
1737
1738 -    :cond_58d
1739 +    :cond_592
1740      const/4 v3, 0x1
1741
1742      move/from16 v0, v57
1743
1744 -    if-ne v0, v3, :cond_59f
1745 +    if-ne v0, v3, :cond_5a4
1746
1747 -    :try_start_592
1748 +    :try_start_597
1749      const-string v3, "SystemServer"
1750
1751      const-string v9, "No Bluetooth Service (factory test)"
1752
1753      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1754
1755 -    goto/16 :goto_1c7
1756 +    goto/16 :goto_1cc
1757
1758 -    :catch_59b
1759 +    :catch_5a0
1760      move-exception v56
1761
1762      move-object/from16 v62, v63
1763
1764 -    goto :goto_571
1765 +    goto :goto_576
1766
1767 -    :cond_59f
1768 +    :cond_5a4
1769      const-string v3, "SystemServer"
1770
1771      const-string v9, "Bluetooth Service"
1772 @@ -1695,10 +1734,10 @@
1773      move-object/from16 v0, v42
1774
1775      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
1776 -    :try_end_5ad
1777 -    .catch Ljava/lang/RuntimeException; {:try_start_592 .. :try_end_5ad} :catch_59b
1778 +    :try_end_5b2
1779 +    .catch Ljava/lang/RuntimeException; {:try_start_597 .. :try_end_5b2} :catch_5a0
1780
1781 -    :try_start_5ad
1782 +    :try_start_5b2
1783      const-string v3, "bluetooth"
1784
1785      move-object/from16 v0, v42
1786 @@ -1714,10 +1753,10 @@
1787      move-object/from16 v1, v42
1788
1789      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
1790 -    :try_end_5c0
1791 -    .catch Ljava/lang/RuntimeException; {:try_start_5ad .. :try_end_5c0} :catch_82c
1792 +    :try_end_5c5
1793 +    .catch Ljava/lang/RuntimeException; {:try_start_5b2 .. :try_end_5c5} :catch_831
1794
1795 -    :try_start_5c0
1796 +    :try_start_5c5
1797      const-string v3, "bluetooth_a2dp"
1798
1799      move-object/from16 v0, v44
1800 @@ -1750,25 +1789,25 @@
1801
1802      move-result v45
1803
1804 -    if-nez v36, :cond_5e7
1805 +    if-nez v36, :cond_5ec
1806
1807 -    if-eqz v45, :cond_5e7
1808 +    if-eqz v45, :cond_5ec
1809
1810      invoke-virtual/range {v42 .. v42}, Landroid/server/BluetoothService;->enable()Z
1811 -    :try_end_5e7
1812 -    .catch Ljava/lang/RuntimeException; {:try_start_5c0 .. :try_end_5e7} :catch_833
1813 +    :try_end_5ec
1814 +    .catch Ljava/lang/RuntimeException; {:try_start_5c5 .. :try_end_5ec} :catch_838
1815
1816 -    :cond_5e7
1817 +    :cond_5ec
1818      move-object/from16 v43, v44
1819
1820      move-object/from16 v41, v42
1821
1822 -    goto/16 :goto_1c7
1823 +    goto/16 :goto_1cc
1824
1825 -    :catch_5ed
1826 +    :catch_5f2
1827      move-exception v56
1828
1829 -    :goto_5ee
1830 +    :goto_5f3
1831      const-string v3, "starting Input Manager Service"
1832
1833      move-object/from16 v0, p0
1834 @@ -1777,9 +1816,9 @@
1835
1836      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1837
1838 -    goto/16 :goto_1f7
1839 +    goto/16 :goto_1fc
1840
1841 -    :catch_5f9
1842 +    :catch_5fe
1843      move-exception v56
1844
1845      const-string v3, "starting Accessibility Manager"
1846 @@ -1790,9 +1829,9 @@
1847
1848      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1849
1850 -    goto/16 :goto_208
1851 +    goto/16 :goto_20d
1852
1853 -    :catch_605
1854 +    :catch_60a
1855      move-exception v56
1856
1857      const-string v3, "making display ready"
1858 @@ -1803,9 +1842,9 @@
1859
1860      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1861
1862 -    goto/16 :goto_20b
1863 +    goto/16 :goto_210
1864
1865 -    :catch_611
1866 +    :catch_616
1867      move-exception v56
1868
1869      const-string v3, "performing boot dexopt"
1870 @@ -1816,12 +1855,12 @@
1871
1872      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1873
1874 -    goto/16 :goto_20e
1875 +    goto/16 :goto_213
1876
1877 -    :catch_61d
1878 +    :catch_622
1879      move-exception v56
1880
1881 -    :goto_61e
1882 +    :goto_623
1883      const-string v3, "starting DevicePolicyService"
1884
1885      move-object/from16 v0, p0
1886 @@ -1830,12 +1869,12 @@
1887
1888      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1889
1890 -    goto/16 :goto_23d
1891 +    goto/16 :goto_242
1892
1893 -    :catch_629
1894 +    :catch_62e
1895      move-exception v56
1896
1897 -    :goto_62a
1898 +    :goto_62f
1899      const-string v3, "starting StatusBarManagerService"
1900
1901      move-object/from16 v0, p0
1902 @@ -1844,9 +1883,9 @@
1903
1904      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1905
1906 -    goto/16 :goto_256
1907 +    goto/16 :goto_25b
1908
1909 -    :catch_635
1910 +    :catch_63a
1911      move-exception v56
1912
1913      const-string v3, "starting Clipboard Service"
1914 @@ -1857,9 +1896,9 @@
1915
1916      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1917
1918 -    goto/16 :goto_267
1919 +    goto/16 :goto_26c
1920
1921 -    :catch_641
1922 +    :catch_646
1923      move-exception v56
1924
1925      const-string v3, "starting NetworkManagement Service"
1926 @@ -1870,12 +1909,12 @@
1927
1928      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1929
1930 -    goto/16 :goto_277
1931 +    goto/16 :goto_27c
1932
1933 -    :catch_64d
1934 +    :catch_652
1935      move-exception v56
1936
1937 -    :goto_64e
1938 +    :goto_653
1939      const-string v3, "starting Text Service Manager Service"
1940
1941      move-object/from16 v0, p0
1942 @@ -1884,12 +1923,12 @@
1943
1944      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1945
1946 -    goto/16 :goto_28e
1947 +    goto/16 :goto_293
1948
1949 -    :catch_659
1950 +    :catch_65e
1951      move-exception v56
1952
1953 -    :goto_65a
1954 +    :goto_65f
1955      const-string v3, "starting NetworkStats Service"
1956
1957      move-object/from16 v0, p0
1958 @@ -1898,14 +1937,14 @@
1959
1960      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1961
1962 -    goto/16 :goto_2a5
1963 +    goto/16 :goto_2aa
1964
1965 -    :catch_665
1966 +    :catch_66a
1967      move-exception v56
1968
1969      move-object/from16 v8, v67
1970
1971 -    :goto_668
1972 +    :goto_66d
1973      const-string v3, "starting NetworkPolicy Service"
1974
1975      move-object/from16 v0, p0
1976 @@ -1914,12 +1953,12 @@
1977
1978      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1979
1980 -    goto/16 :goto_2bc
1981 +    goto/16 :goto_2c1
1982
1983 -    :catch_673
1984 +    :catch_678
1985      move-exception v56
1986
1987 -    :goto_674
1988 +    :goto_679
1989      const-string v3, "starting Wi-Fi P2pService"
1990
1991      move-object/from16 v0, p0
1992 @@ -1928,12 +1967,12 @@
1993
1994      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1995
1996 -    goto/16 :goto_2d3
1997 +    goto/16 :goto_2d8
1998
1999 -    :catch_67f
2000 +    :catch_684
2001      move-exception v56
2002
2003 -    :goto_680
2004 +    :goto_685
2005      const-string v3, "starting Wi-Fi Service"
2006
2007      move-object/from16 v0, p0
2008 @@ -1942,12 +1981,12 @@
2009
2010      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2011
2012 -    goto/16 :goto_2ea
2013 +    goto/16 :goto_2ef
2014
2015 -    :catch_68b
2016 +    :catch_690
2017      move-exception v56
2018
2019 -    :goto_68c
2020 +    :goto_691
2021      const-string v3, "starting Connectivity Service"
2022
2023      move-object/from16 v0, p0
2024 @@ -1956,12 +1995,12 @@
2025
2026      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2027
2028 -    goto/16 :goto_311
2029 +    goto/16 :goto_316
2030
2031 -    :catch_697
2032 +    :catch_69c
2033      move-exception v56
2034
2035 -    :goto_698
2036 +    :goto_69d
2037      const-string v3, "starting ThrottleService"
2038
2039      move-object/from16 v0, p0
2040 @@ -1970,9 +2009,9 @@
2041
2042      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2043
2044 -    goto/16 :goto_328
2045 +    goto/16 :goto_32d
2046
2047 -    :catch_6a3
2048 +    :catch_6a8
2049      move-exception v56
2050
2051      const-string v3, "starting Mount Service"
2052 @@ -1983,12 +2022,12 @@
2053
2054      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2055
2056 -    goto/16 :goto_339
2057 +    goto/16 :goto_33e
2058
2059 -    :catch_6af
2060 +    :catch_6b4
2061      move-exception v56
2062
2063 -    :goto_6b0
2064 +    :goto_6b5
2065      const-string v3, "starting Notification Manager"
2066
2067      move-object/from16 v0, p0
2068 @@ -1997,9 +2036,9 @@
2069
2070      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2071
2072 -    goto/16 :goto_359
2073 +    goto/16 :goto_35e
2074
2075 -    :catch_6bb
2076 +    :catch_6c0
2077      move-exception v56
2078
2079      const-string v3, "starting DeviceStorageMonitor service"
2080 @@ -2010,12 +2049,12 @@
2081
2082      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2083
2084 -    goto/16 :goto_36a
2085 +    goto/16 :goto_36f
2086
2087 -    :catch_6c7
2088 +    :catch_6cc
2089      move-exception v56
2090
2091 -    :goto_6c8
2092 +    :goto_6cd
2093      const-string v3, "starting Location Manager"
2094
2095      move-object/from16 v0, p0
2096 @@ -2024,12 +2063,12 @@
2097
2098      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2099
2100 -    goto/16 :goto_381
2101 +    goto/16 :goto_386
2102
2103 -    :catch_6d3
2104 +    :catch_6d8
2105      move-exception v56
2106
2107 -    :goto_6d4
2108 +    :goto_6d9
2109      const-string v3, "starting Country Detector"
2110
2111      move-object/from16 v0, p0
2112 @@ -2038,9 +2077,9 @@
2113
2114      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2115
2116 -    goto/16 :goto_398
2117 +    goto/16 :goto_39d
2118
2119 -    :catch_6df
2120 +    :catch_6e4
2121      move-exception v56
2122
2123      const-string v3, "starting Search Service"
2124 @@ -2051,9 +2090,9 @@
2125
2126      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2127
2128 -    goto/16 :goto_3a9
2129 +    goto/16 :goto_3ae
2130
2131 -    :catch_6eb
2132 +    :catch_6f0
2133      move-exception v56
2134
2135      const-string v3, "starting DropBoxManagerService"
2136 @@ -2064,12 +2103,12 @@
2137
2138      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2139
2140 -    goto/16 :goto_3c1
2141 +    goto/16 :goto_3c6
2142
2143 -    :catch_6f7
2144 +    :catch_6fc
2145      move-exception v56
2146
2147 -    :goto_6f8
2148 +    :goto_6fd
2149      const-string v3, "starting Wallpaper Service"
2150
2151      move-object/from16 v0, p0
2152 @@ -2078,9 +2117,9 @@
2153
2154      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2155
2156 -    goto/16 :goto_3d8
2157 +    goto/16 :goto_3dd
2158
2159 -    :catch_703
2160 +    :catch_708
2161      move-exception v56
2162
2163      const-string v3, "starting Audio Service"
2164 @@ -2091,9 +2130,9 @@
2165
2166      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2167
2168 -    goto/16 :goto_3e9
2169 +    goto/16 :goto_3ee
2170
2171 -    :catch_70f
2172 +    :catch_714
2173      move-exception v56
2174
2175      const-string v3, "starting DockObserver"
2176 @@ -2104,9 +2143,9 @@
2177
2178      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2179
2180 -    goto/16 :goto_3f9
2181 +    goto/16 :goto_3fe
2182
2183 -    :catch_71b
2184 +    :catch_720
2185      move-exception v56
2186
2187      const-string v3, "starting WiredAccessoryObserver"
2188 @@ -2117,12 +2156,12 @@
2189
2190      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2191
2192 -    goto/16 :goto_405
2193 +    goto/16 :goto_40a
2194
2195 -    :catch_727
2196 +    :catch_72c
2197      move-exception v56
2198
2199 -    :goto_728
2200 +    :goto_72d
2201      const-string v3, "starting UsbService"
2202
2203      move-object/from16 v0, p0
2204 @@ -2131,9 +2170,9 @@
2205
2206      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2207
2208 -    goto/16 :goto_41c
2209 +    goto/16 :goto_421
2210
2211 -    :catch_733
2212 +    :catch_738
2213      move-exception v56
2214
2215      const-string v3, "starting UiModeManagerService"
2216 @@ -2144,9 +2183,9 @@
2217
2218      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2219
2220 -    goto/16 :goto_42c
2221 +    goto/16 :goto_431
2222
2223 -    :catch_73f
2224 +    :catch_744
2225      move-exception v56
2226
2227      const-string v3, "SystemServer"
2228 @@ -2157,12 +2196,12 @@
2229
2230      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2231
2232 -    goto/16 :goto_43d
2233 +    goto/16 :goto_442
2234
2235 -    :catch_74b
2236 +    :catch_750
2237      move-exception v56
2238
2239 -    :goto_74c
2240 +    :goto_751
2241      const-string v3, "starting AppWidget Service"
2242
2243      move-object/from16 v0, p0
2244 @@ -2171,9 +2210,9 @@
2245
2246      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2247
2248 -    goto/16 :goto_454
2249 +    goto/16 :goto_459
2250
2251 -    :catch_757
2252 +    :catch_75c
2253      move-exception v56
2254
2255      const-string v3, "starting Recognition Service"
2256 @@ -2184,9 +2223,9 @@
2257
2258      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2259
2260 -    goto/16 :goto_464
2261 +    goto/16 :goto_469
2262
2263 -    :catch_763
2264 +    :catch_768
2265      move-exception v56
2266
2267      const-string v3, "starting DiskStats Service"
2268 @@ -2197,9 +2236,9 @@
2269
2270      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2271
2272 -    goto/16 :goto_475
2273 +    goto/16 :goto_47a
2274
2275 -    :catch_76f
2276 +    :catch_774
2277      move-exception v56
2278
2279      const-string v3, "starting SamplingProfiler Service"
2280 @@ -2210,9 +2249,9 @@
2281
2282      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2283
2284 -    goto/16 :goto_486
2285 +    goto/16 :goto_48b
2286
2287 -    :catch_77b
2288 +    :catch_780
2289      move-exception v56
2290
2291      const-string v3, "starting NetworkTimeUpdate service"
2292 @@ -2223,18 +2262,18 @@
2293
2294      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2295
2296 -    goto/16 :goto_496
2297 +    goto/16 :goto_49b
2298
2299 -    :cond_787
2300 +    :cond_78c
2301      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
2302
2303      move-result-object v3
2304
2305      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
2306
2307 -    goto/16 :goto_4ad
2308 +    goto/16 :goto_4b2
2309
2310 -    :catch_790
2311 +    :catch_795
2312      move-exception v56
2313
2314      const-string v3, "making Device Policy Service ready"
2315 @@ -2245,9 +2284,9 @@
2316
2317      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2318
2319 -    goto/16 :goto_4b2
2320 +    goto/16 :goto_4b7
2321
2322 -    :catch_79c
2323 +    :catch_7a1
2324      move-exception v56
2325
2326      const-string v3, "making Notification Service ready"
2327 @@ -2258,9 +2297,9 @@
2328
2329      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2330
2331 -    goto/16 :goto_4b7
2332 +    goto/16 :goto_4bc
2333
2334 -    :catch_7a8
2335 +    :catch_7ad
2336      move-exception v56
2337
2338      const-string v3, "making Window Manager Service ready"
2339 @@ -2271,9 +2310,9 @@
2340
2341      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2342
2343 -    goto/16 :goto_4ba
2344 +    goto/16 :goto_4bf
2345
2346 -    :catch_7b4
2347 +    :catch_7b9
2348      move-exception v56
2349
2350      const-string v3, "making Package Manager Service ready"
2351 @@ -2284,129 +2323,129 @@
2352
2353      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2354
2355 -    goto/16 :goto_4ee
2356 +    goto/16 :goto_4f3
2357
2358 -    :catch_7c0
2359 +    :catch_7c5
2360      move-exception v3
2361
2362      goto/16 :goto_f9
2363
2364 -    :catch_7c3
2365 +    :catch_7c8
2366      move-exception v56
2367
2368      move-object/from16 v38, v39
2369
2370 -    goto :goto_74c
2371 +    goto :goto_751
2372
2373 -    :catch_7c7
2374 +    :catch_7cc
2375      move-exception v56
2376
2377      move-object/from16 v89, v90
2378
2379 -    goto/16 :goto_728
2380 +    goto/16 :goto_72d
2381
2382 -    :catch_7cc
2383 +    :catch_7d1
2384      move-exception v56
2385
2386      move-object/from16 v92, v93
2387
2388 -    goto/16 :goto_6f8
2389 +    goto/16 :goto_6fd
2390
2391 -    :catch_7d1
2392 +    :catch_7d6
2393      move-exception v56
2394
2395      move-object/from16 v49, v50
2396
2397 -    goto/16 :goto_6d4
2398 +    goto/16 :goto_6d9
2399
2400 -    :catch_7d6
2401 +    :catch_7db
2402      move-exception v56
2403
2404      move-object/from16 v64, v65
2405
2406 -    goto/16 :goto_6c8
2407 +    goto/16 :goto_6cd
2408
2409 -    :catch_7db
2410 +    :catch_7e0
2411      move-exception v56
2412
2413      move-object/from16 v71, v72
2414
2415 -    goto/16 :goto_6b0
2416 +    goto/16 :goto_6b5
2417
2418 -    :catch_7e0
2419 +    :catch_7e5
2420      move-exception v56
2421
2422      move-object/from16 v83, v84
2423
2424 -    goto/16 :goto_698
2425 +    goto/16 :goto_69d
2426
2427 -    :catch_7e5
2428 +    :catch_7ea
2429      move-exception v56
2430
2431      move-object/from16 v47, v48
2432
2433 -    goto/16 :goto_68c
2434 +    goto/16 :goto_691
2435
2436 -    :catch_7ea
2437 +    :catch_7ef
2438      move-exception v56
2439
2440      move-object/from16 v94, v95
2441
2442 -    goto/16 :goto_680
2443 +    goto/16 :goto_685
2444
2445 -    :catch_7ef
2446 +    :catch_7f4
2447      move-exception v56
2448
2449      move-object/from16 v96, v97
2450
2451 -    goto/16 :goto_674
2452 +    goto/16 :goto_679
2453
2454 -    :catch_7f4
2455 +    :catch_7f9
2456      move-exception v56
2457
2458 -    goto/16 :goto_668
2459 +    goto/16 :goto_66d
2460
2461 -    :catch_7f7
2462 +    :catch_7fc
2463      move-exception v56
2464
2465      move-object/from16 v12, v68
2466
2467 -    goto/16 :goto_65a
2468 +    goto/16 :goto_65f
2469
2470 -    :catch_7fc
2471 +    :catch_801
2472      move-exception v56
2473
2474      move-object/from16 v85, v86
2475
2476 -    goto/16 :goto_64e
2477 +    goto/16 :goto_653
2478
2479 -    :catch_801
2480 +    :catch_806
2481      move-exception v56
2482
2483      move-object/from16 v81, v82
2484
2485 -    goto/16 :goto_62a
2486 +    goto/16 :goto_62f
2487
2488 -    :catch_806
2489 +    :catch_80b
2490      move-exception v56
2491
2492      move-object/from16 v52, v53
2493
2494 -    goto/16 :goto_61e
2495 +    goto/16 :goto_623
2496
2497 -    :catch_80b
2498 +    :catch_810
2499      move-exception v3
2500
2501 -    goto/16 :goto_221
2502 +    goto/16 :goto_226
2503
2504 -    :catch_80e
2505 +    :catch_813
2506      move-exception v56
2507
2508      move-object/from16 v60, v61
2509
2510 -    goto/16 :goto_5ee
2511 +    goto/16 :goto_5f3
2512
2513 -    :catch_813
2514 +    :catch_818
2515      move-exception v56
2516
2517      move-object/from16 v7, v37
2518 @@ -2415,9 +2454,9 @@
2519
2520      move-object/from16 v6, v75
2521
2522 -    goto/16 :goto_571
2523 +    goto/16 :goto_576
2524
2525 -    :catch_81c
2526 +    :catch_821
2527      move-exception v56
2528
2529      move-object/from16 v7, v37
2530 @@ -2426,27 +2465,27 @@
2531
2532      move-object/from16 v62, v63
2533
2534 -    goto/16 :goto_571
2535 +    goto/16 :goto_576
2536
2537 -    :catch_825
2538 +    :catch_82a
2539      move-exception v56
2540
2541      move-object/from16 v7, v37
2542
2543      move-object/from16 v62, v63
2544
2545 -    goto/16 :goto_571
2546 +    goto/16 :goto_576
2547
2548 -    :catch_82c
2549 +    :catch_831
2550      move-exception v56
2551
2552      move-object/from16 v41, v42
2553
2554      move-object/from16 v62, v63
2555
2556 -    goto/16 :goto_571
2557 +    goto/16 :goto_576
2558
2559 -    :catch_833
2560 +    :catch_838
2561      move-exception v56
2562
2563      move-object/from16 v43, v44
2564 @@ -2455,10 +2494,10 @@
2565
2566      move-object/from16 v62, v63
2567
2568 -    goto/16 :goto_571
2569 +    goto/16 :goto_576
2570
2571 -    :cond_83c
2572 +    :cond_841
2573      move-object/from16 v8, v67
2574
2575 -    goto/16 :goto_496
2576 +    goto/16 :goto_49b
2577  .end method