patches/pdroid/4.0/aokp/20120506/services.patch

   1 diff -Npru stock-services/smali/com/android/server/am/ActivityManagerService.smali pdroid-services/smali/com/android/server/am/ActivityManagerService.smali
   2 --- stock-services/smali/com/android/server/am/ActivityManagerService.smali     2012-05-05 11:15:31.069963852 -0500
   3 +++ pdroid-services/smali/com/android/server/am/ActivityManagerService.smali    2012-05-05 11:17:09.478451845 -0500
   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 pdroid-services/smali/com/android/server/ServerThread.smali
 492 --- stock-services/smali/com/android/server/ServerThread.smali  2012-05-05 11:15:30.597961515 -0500
 493 +++ pdroid-services/smali/com/android/server/ServerThread.smali 2012-05-05 11:17:09.010449516 -0500
 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_58d
 541 +    if-ne v3, v9, :cond_592
 542
 543      const/16 v84, 0x1
 544
 545 @@ -166,7 +201,7 @@
 546
 547      const/4 v9, 0x1
 548
 549 -    if-le v3, v9, :cond_591
 550 +    if-le v3, v9, :cond_596
 551
 552      const/4 v3, 0x1
 553
 554 @@ -202,7 +237,7 @@
 555
 556      move-result v3
 557
 558 -    if-eqz v3, :cond_595
 559 +    if-eqz v3, :cond_59a
 560
 561      const/16 v62, 0x0
 562
 563 @@ -278,7 +313,7 @@
 564
 565      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
 566      :try_end_a8
 567 -    .catch Ljava/lang/RuntimeException; {:try_start_8b .. :try_end_a8} :catch_87f
 568 +    .catch Ljava/lang/RuntimeException; {:try_start_8b .. :try_end_a8} :catch_884
 569
 570      :try_start_a8
 571      const-string v3, "power"
 572 @@ -333,7 +368,7 @@
 573
 574      move-result v3
 575
 576 -    if-eqz v3, :cond_59b
 577 +    if-eqz v3, :cond_5a0
 578
 579      const-string v3, "SystemServer"
 580
 581 @@ -345,7 +380,7 @@
 582
 583      :cond_ee
 584      :goto_ee
 585 -    if-eqz v62, :cond_5b0
 586 +    if-eqz v62, :cond_5b5
 587
 588      const/4 v3, 0x1
 589
 590 @@ -354,7 +389,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_f6
 594 -    .catch Ljava/lang/RuntimeException; {:try_start_a8 .. :try_end_f6} :catch_5bf
 595 +    .catch Ljava/lang/RuntimeException; {:try_start_a8 .. :try_end_f6} :catch_5c4
 596
 597      move-result-object v79
 598
 599 @@ -363,8 +398,8 @@
 600      :try_start_f9
 601      invoke-interface/range {v79 .. v79}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
 602      :try_end_fc
 603 -    .catch Landroid/os/RemoteException; {:try_start_f9 .. :try_end_fc} :catch_82b
 604 -    .catch Ljava/lang/RuntimeException; {:try_start_f9 .. :try_end_fc} :catch_5bf
 605 +    .catch Landroid/os/RemoteException; {:try_start_f9 .. :try_end_fc} :catch_830
 606 +    .catch Ljava/lang/RuntimeException; {:try_start_f9 .. :try_end_fc} :catch_5c4
 607
 608      move-result v64
 609
 610 @@ -380,7 +415,7 @@
 611
 612      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
 613      :try_end_108
 614 -    .catch Ljava/lang/RuntimeException; {:try_start_fd .. :try_end_108} :catch_5bf
 615 +    .catch Ljava/lang/RuntimeException; {:try_start_fd .. :try_end_108} :catch_5c4
 616
 617      :try_start_108
 618      const-string v3, "SystemServer"
 619 @@ -397,8 +432,8 @@
 620
 621      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 622      :try_end_119
 623 -    .catch Ljava/lang/Throwable; {:try_start_108 .. :try_end_119} :catch_5b3
 624 -    .catch Ljava/lang/RuntimeException; {:try_start_108 .. :try_end_119} :catch_5bf
 625 +    .catch Ljava/lang/Throwable; {:try_start_108 .. :try_end_119} :catch_5b8
 626 +    .catch Ljava/lang/RuntimeException; {:try_start_108 .. :try_end_119} :catch_5c4
 627
 628      :goto_119
 629      :try_start_119
 630 @@ -412,13 +447,17 @@
 631
 632      move/from16 v0, v62
 633
 634 -    if-ne v0, v3, :cond_5d6
 635 +    if-ne v0, v3, :cond_5db
 636
 637      const/4 v3, 0x1
 638
 639      :goto_126
 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 @@ -438,10 +477,10 @@
 650      move-object/from16 v0, v68
 651
 652      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
 653 -    :try_end_141
 654 -    .catch Ljava/lang/RuntimeException; {:try_start_119 .. :try_end_141} :catch_5bf
 655 +    :try_end_146
 656 +    .catch Ljava/lang/RuntimeException; {:try_start_119 .. :try_end_146} :catch_5c4
 657
 658 -    :try_start_141
 659 +    :try_start_146
 660      const-string v3, "SystemServer"
 661
 662      const-string v9, "Battery Service"
 663 @@ -453,10 +492,10 @@
 664      move-object/from16 v0, v68
 665
 666      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
 667 -    :try_end_14f
 668 -    .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_14f} :catch_888
 669 +    :try_end_154
 670 +    .catch Ljava/lang/RuntimeException; {:try_start_146 .. :try_end_154} :catch_88d
 671
 672 -    :try_start_14f
 673 +    :try_start_154
 674      const-string v3, "battery"
 675
 676      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 677 @@ -492,10 +531,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_17a
 682 -    .catch Ljava/lang/RuntimeException; {:try_start_14f .. :try_end_17a} :catch_891
 683 +    :try_end_17f
 684 +    .catch Ljava/lang/RuntimeException; {:try_start_154 .. :try_end_17f} :catch_896
 685
 686 -    :try_start_17a
 687 +    :try_start_17f
 688      const-string v3, "alarm"
 689
 690      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 691 @@ -526,18 +565,18 @@
 692
 693      move/from16 v0, v62
 694
 695 -    if-eq v0, v3, :cond_5d9
 696 +    if-eq v0, v3, :cond_5de
 697
 698      const/4 v3, 0x1
 699
 700      move v9, v3
 701
 702 -    :goto_19f
 703 -    if-nez v64, :cond_5dd
 704 +    :goto_1a4
 705 +    if-nez v64, :cond_5e2
 706
 707      const/4 v3, 0x1
 708
 709 -    :goto_1a2
 710 +    :goto_1a7
 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 v105
 714 @@ -568,7 +607,7 @@
 715
 716      move-result v3
 717
 718 -    if-eqz v3, :cond_5e0
 719 +    if-eqz v3, :cond_5e5
 720
 721      const-string v3, "SystemServer"
 722
 723 @@ -576,10 +615,10 @@
 724
 725      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
 726
 727 -    :goto_1cb
 728 +    :goto_1d0
 729      sget-boolean v3, Landroid/os/SystemProperties;->QCOM_HARDWARE:Z
 730
 731 -    if-eqz v3, :cond_1f1
 732 +    if-eqz v3, :cond_1f6
 733
 734      const-string v3, "SystemServer"
 735
 736 @@ -592,38 +631,38 @@
 737      move-object/from16 v0, v58
 738
 739      invoke-direct {v0, v4}, Lcom/android/server/DynamicMemoryManagerService;-><init>(Landroid/content/Context;)V
 740 -    :try_end_1dd
 741 -    .catch Ljava/lang/RuntimeException; {:try_start_17a .. :try_end_1dd} :catch_5ee
 742 +    :try_end_1e2
 743 +    .catch Ljava/lang/RuntimeException; {:try_start_17f .. :try_end_1e2} :catch_5f3
 744
 745 -    :try_start_1dd
 746 +    :try_start_1e2
 747      new-instance v53, Lcom/android/server/CpuGovernorService;
 748
 749      move-object/from16 v0, v53
 750
 751      invoke-direct {v0, v4}, Lcom/android/server/CpuGovernorService;-><init>(Landroid/content/Context;)V
 752 -    :try_end_1e4
 753 -    .catch Ljava/lang/RuntimeException; {:try_start_1dd .. :try_end_1e4} :catch_8a8
 754 +    :try_end_1e9
 755 +    .catch Ljava/lang/RuntimeException; {:try_start_1e2 .. :try_end_1e9} :catch_8ad
 756
 757 -    if-nez v53, :cond_1ed
 758 +    if-nez v53, :cond_1f2
 759
 760 -    :try_start_1e6
 761 +    :try_start_1eb
 762      const-string v3, "SystemServer"
 763
 764      const-string v9, "CpuGovernorService failed to start"
 765
 766      invoke-static {v3, v9}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;)I
 767 -    :try_end_1ed
 768 -    .catch Ljava/lang/RuntimeException; {:try_start_1e6 .. :try_end_1ed} :catch_8af
 769 +    :try_end_1f2
 770 +    .catch Ljava/lang/RuntimeException; {:try_start_1eb .. :try_end_1f2} :catch_8b4
 771
 772 -    :cond_1ed
 773 +    :cond_1f2
 774      move-object/from16 v52, v53
 775
 776      move-object/from16 v57, v58
 777
 778 -    :cond_1f1
 779 +    :cond_1f6
 780      move-object/from16 v67, v68
 781
 782 -    :goto_1f3
 783 +    :goto_1f8
 784      const/16 v55, 0x0
 785
 786      const/16 v88, 0x0
 787 @@ -648,9 +687,9 @@
 788
 789      move/from16 v0, v62
 790
 791 -    if-eq v0, v3, :cond_234
 792 +    if-eq v0, v3, :cond_239
 793
 794 -    :try_start_20c
 795 +    :try_start_211
 796      const-string v3, "SystemServer"
 797
 798      const-string v9, "Input Method Service"
 799 @@ -662,22 +701,22 @@
 800      move-object/from16 v0, v66
 801
 802      invoke-direct {v0, v4}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;)V
 803 -    :try_end_21a
 804 -    .catch Ljava/lang/Throwable; {:try_start_20c .. :try_end_21a} :catch_640
 805 +    :try_end_21f
 806 +    .catch Ljava/lang/Throwable; {:try_start_211 .. :try_end_21f} :catch_645
 807
 808 -    :try_start_21a
 809 +    :try_start_21f
 810      const-string v3, "input_method"
 811
 812      move-object/from16 v0, v66
 813
 814      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 815 -    :try_end_221
 816 -    .catch Ljava/lang/Throwable; {:try_start_21a .. :try_end_221} :catch_87a
 817 +    :try_end_226
 818 +    .catch Ljava/lang/Throwable; {:try_start_21f .. :try_end_226} :catch_87f
 819
 820      move-object/from16 v65, v66
 821
 822 -    :goto_223
 823 -    :try_start_223
 824 +    :goto_228
 825 +    :try_start_228
 826      const-string v3, "SystemServer"
 827
 828      const-string v9, "Accessibility Manager"
 829 @@ -691,24 +730,24 @@
 830      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
 831
 832      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 833 -    :try_end_234
 834 -    .catch Ljava/lang/Throwable; {:try_start_223 .. :try_end_234} :catch_64c
 835 +    :try_end_239
 836 +    .catch Ljava/lang/Throwable; {:try_start_228 .. :try_end_239} :catch_651
 837
 838 -    :cond_234
 839 -    :goto_234
 840 -    :try_start_234
 841 +    :cond_239
 842 +    :goto_239
 843 +    :try_start_239
 844      invoke-virtual/range {v105 .. v105}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
 845 -    :try_end_237
 846 -    .catch Ljava/lang/Throwable; {:try_start_234 .. :try_end_237} :catch_658
 847 +    :try_end_23c
 848 +    .catch Ljava/lang/Throwable; {:try_start_239 .. :try_end_23c} :catch_65d
 849
 850 -    :goto_237
 851 -    :try_start_237
 852 +    :goto_23c
 853 +    :try_start_23c
 854      invoke-interface/range {v79 .. v79}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
 855 -    :try_end_23a
 856 -    .catch Ljava/lang/Throwable; {:try_start_237 .. :try_end_23a} :catch_664
 857 +    :try_end_23f
 858 +    .catch Ljava/lang/Throwable; {:try_start_23c .. :try_end_23f} :catch_669
 859
 860 -    :goto_23a
 861 -    :try_start_23a
 862 +    :goto_23f
 863 +    :try_start_23f
 864      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
 865
 866      move-result-object v3
 867 @@ -726,17 +765,17 @@
 868      const/4 v10, 0x0
 869
 870      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
 871 -    :try_end_24d
 872 -    .catch Landroid/os/RemoteException; {:try_start_23a .. :try_end_24d} :catch_877
 873 +    :try_end_252
 874 +    .catch Landroid/os/RemoteException; {:try_start_23f .. :try_end_252} :catch_87c
 875
 876 -    :goto_24d
 877 +    :goto_252
 878      const/4 v3, 0x1
 879
 880      move/from16 v0, v62
 881
 882 -    if-eq v0, v3, :cond_8b8
 883 +    if-eq v0, v3, :cond_8bd
 884
 885 -    :try_start_252
 886 +    :try_start_257
 887      const-string v3, "SystemServer"
 888
 889      const-string v9, "Device Policy"
 890 @@ -748,22 +787,22 @@
 891      move-object/from16 v0, v56
 892
 893      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
 894 -    :try_end_260
 895 -    .catch Ljava/lang/Throwable; {:try_start_252 .. :try_end_260} :catch_670
 896 +    :try_end_265
 897 +    .catch Ljava/lang/Throwable; {:try_start_257 .. :try_end_265} :catch_675
 898
 899 -    :try_start_260
 900 +    :try_start_265
 901      const-string v3, "device_policy"
 902
 903      move-object/from16 v0, v56
 904
 905      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 906 -    :try_end_267
 907 -    .catch Ljava/lang/Throwable; {:try_start_260 .. :try_end_267} :catch_872
 908 +    :try_end_26c
 909 +    .catch Ljava/lang/Throwable; {:try_start_265 .. :try_end_26c} :catch_877
 910
 911      move-object/from16 v55, v56
 912
 913 -    :goto_269
 914 -    :try_start_269
 915 +    :goto_26e
 916 +    :try_start_26e
 917      const-string v3, "SystemServer"
 918
 919      const-string v9, "Status Bar"
 920 @@ -777,22 +816,22 @@
 921      move-object/from16 v1, v105
 922
 923      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
 924 -    :try_end_279
 925 -    .catch Ljava/lang/Throwable; {:try_start_269 .. :try_end_279} :catch_67c
 926 +    :try_end_27e
 927 +    .catch Ljava/lang/Throwable; {:try_start_26e .. :try_end_27e} :catch_681
 928
 929 -    :try_start_279
 930 +    :try_start_27e
 931      const-string v3, "statusbar"
 932
 933      move-object/from16 v0, v89
 934
 935      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 936 -    :try_end_280
 937 -    .catch Ljava/lang/Throwable; {:try_start_279 .. :try_end_280} :catch_86d
 938 +    :try_end_285
 939 +    .catch Ljava/lang/Throwable; {:try_start_27e .. :try_end_285} :catch_872
 940
 941      move-object/from16 v88, v89
 942
 943 -    :goto_282
 944 -    :try_start_282
 945 +    :goto_287
 946 +    :try_start_287
 947      const-string v3, "SystemServer"
 948
 949      const-string v9, "Clipboard Service"
 950 @@ -806,11 +845,11 @@
 951      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
 952
 953      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 954 -    :try_end_293
 955 -    .catch Ljava/lang/Throwable; {:try_start_282 .. :try_end_293} :catch_688
 956 +    :try_end_298
 957 +    .catch Ljava/lang/Throwable; {:try_start_287 .. :try_end_298} :catch_68d
 958
 959 -    :goto_293
 960 -    :try_start_293
 961 +    :goto_298
 962 +    :try_start_298
 963      const-string v3, "SystemServer"
 964
 965      const-string v9, "NetworkManagement Service"
 966 @@ -824,11 +863,11 @@
 967      const-string v3, "network_management"
 968
 969      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 970 -    :try_end_2a3
 971 -    .catch Ljava/lang/Throwable; {:try_start_293 .. :try_end_2a3} :catch_694
 972 +    :try_end_2a8
 973 +    .catch Ljava/lang/Throwable; {:try_start_298 .. :try_end_2a8} :catch_699
 974
 975 -    :goto_2a3
 976 -    :try_start_2a3
 977 +    :goto_2a8
 978 +    :try_start_2a8
 979      const-string v3, "SystemServer"
 980
 981      const-string v9, "Text Service Manager Service"
 982 @@ -840,22 +879,22 @@
 983      move-object/from16 v0, v93
 984
 985      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
 986 -    :try_end_2b1
 987 -    .catch Ljava/lang/Throwable; {:try_start_2a3 .. :try_end_2b1} :catch_6a0
 988 +    :try_end_2b6
 989 +    .catch Ljava/lang/Throwable; {:try_start_2a8 .. :try_end_2b6} :catch_6a5
 990
 991 -    :try_start_2b1
 992 +    :try_start_2b6
 993      const-string v3, "textservices"
 994
 995      move-object/from16 v0, v93
 996
 997      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 998 -    :try_end_2b8
 999 -    .catch Ljava/lang/Throwable; {:try_start_2b1 .. :try_end_2b8} :catch_868
1000 +    :try_end_2bd
1001 +    .catch Ljava/lang/Throwable; {:try_start_2b6 .. :try_end_2bd} :catch_86d
1002
1003      move-object/from16 v92, v93
1004
1005 -    :goto_2ba
1006 -    :try_start_2ba
1007 +    :goto_2bf
1008 +    :try_start_2bf
1009      const-string v3, "SystemServer"
1010
1011      const-string v9, "NetworkStats Service"
1012 @@ -867,22 +906,22 @@
1013      move-object/from16 v0, v73
1014
1015      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
1016 -    :try_end_2c8
1017 -    .catch Ljava/lang/Throwable; {:try_start_2ba .. :try_end_2c8} :catch_6ac
1018 +    :try_end_2cd
1019 +    .catch Ljava/lang/Throwable; {:try_start_2bf .. :try_end_2cd} :catch_6b1
1020
1021 -    :try_start_2c8
1022 +    :try_start_2cd
1023      const-string v3, "netstats"
1024
1025      move-object/from16 v0, v73
1026
1027      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1028 -    :try_end_2cf
1029 -    .catch Ljava/lang/Throwable; {:try_start_2c8 .. :try_end_2cf} :catch_863
1030 +    :try_end_2d4
1031 +    .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2d4} :catch_868
1032
1033      move-object/from16 v12, v73
1034
1035 -    :goto_2d1
1036 -    :try_start_2d1
1037 +    :goto_2d6
1038 +    :try_start_2d6
1039      const-string v3, "SystemServer"
1040
1041      const-string v9, "NetworkPolicy Service"
1042 @@ -900,18 +939,18 @@
1043      move-object v11, v6
1044
1045      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
1046 -    :try_end_2e3
1047 -    .catch Ljava/lang/Throwable; {:try_start_2d1 .. :try_end_2e3} :catch_6b8
1048 +    :try_end_2e8
1049 +    .catch Ljava/lang/Throwable; {:try_start_2d6 .. :try_end_2e8} :catch_6bd
1050
1051 -    :try_start_2e3
1052 +    :try_start_2e8
1053      const-string v3, "netpolicy"
1054
1055      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1056 -    :try_end_2e8
1057 -    .catch Ljava/lang/Throwable; {:try_start_2e3 .. :try_end_2e8} :catch_860
1058 +    :try_end_2ed
1059 +    .catch Ljava/lang/Throwable; {:try_start_2e8 .. :try_end_2ed} :catch_865
1060
1061 -    :goto_2e8
1062 -    :try_start_2e8
1063 +    :goto_2ed
1064 +    :try_start_2ed
1065      const-string v3, "SystemServer"
1066
1067      const-string v9, "Wi-Fi P2pService"
1068 @@ -923,22 +962,22 @@
1069      move-object/from16 v0, v104
1070
1071      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
1072 -    :try_end_2f6
1073 -    .catch Ljava/lang/Throwable; {:try_start_2e8 .. :try_end_2f6} :catch_6c6
1074 +    :try_end_2fb
1075 +    .catch Ljava/lang/Throwable; {:try_start_2ed .. :try_end_2fb} :catch_6cb
1076
1077 -    :try_start_2f6
1078 +    :try_start_2fb
1079      const-string v3, "wifip2p"
1080
1081      move-object/from16 v0, v104
1082
1083      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1084 -    :try_end_2fd
1085 -    .catch Ljava/lang/Throwable; {:try_start_2f6 .. :try_end_2fd} :catch_85b
1086 +    :try_end_302
1087 +    .catch Ljava/lang/Throwable; {:try_start_2fb .. :try_end_302} :catch_860
1088
1089      move-object/from16 v103, v104
1090
1091 -    :goto_2ff
1092 -    :try_start_2ff
1093 +    :goto_304
1094 +    :try_start_304
1095      const-string v3, "SystemServer"
1096
1097      const-string v9, "Wi-Fi Service"
1098 @@ -950,22 +989,22 @@
1099      move-object/from16 v0, v102
1100
1101      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
1102 -    :try_end_30d
1103 -    .catch Ljava/lang/Throwable; {:try_start_2ff .. :try_end_30d} :catch_6d2
1104 +    :try_end_312
1105 +    .catch Ljava/lang/Throwable; {:try_start_304 .. :try_end_312} :catch_6d7
1106
1107 -    :try_start_30d
1108 +    :try_start_312
1109      const-string v3, "wifi"
1110
1111      move-object/from16 v0, v102
1112
1113      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1114 -    :try_end_314
1115 -    .catch Ljava/lang/Throwable; {:try_start_30d .. :try_end_314} :catch_856
1116 +    :try_end_319
1117 +    .catch Ljava/lang/Throwable; {:try_start_312 .. :try_end_319} :catch_85b
1118
1119      move-object/from16 v101, v102
1120
1121 -    :goto_316
1122 -    :try_start_316
1123 +    :goto_31b
1124 +    :try_start_31b
1125      const-string v3, "SystemServer"
1126
1127      const-string v9, "Connectivity Service"
1128 @@ -977,10 +1016,10 @@
1129      move-object/from16 v0, v49
1130
1131      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
1132 -    :try_end_324
1133 -    .catch Ljava/lang/Throwable; {:try_start_316 .. :try_end_324} :catch_6de
1134 +    :try_end_329
1135 +    .catch Ljava/lang/Throwable; {:try_start_31b .. :try_end_329} :catch_6e3
1136
1137 -    :try_start_324
1138 +    :try_start_329
1139      const-string v3, "connectivity"
1140
1141      move-object/from16 v0, v49
1142 @@ -998,13 +1037,13 @@
1143      invoke-virtual/range {v101 .. v101}, Lcom/android/server/WifiService;->checkAndStartWifi()V
1144
1145      invoke-virtual/range {v103 .. v103}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
1146 -    :try_end_33b
1147 -    .catch Ljava/lang/Throwable; {:try_start_324 .. :try_end_33b} :catch_851
1148 +    :try_end_340
1149 +    .catch Ljava/lang/Throwable; {:try_start_329 .. :try_end_340} :catch_856
1150
1151      move-object/from16 v48, v49
1152
1153 -    :goto_33d
1154 -    :try_start_33d
1155 +    :goto_342
1156 +    :try_start_342
1157      const-string v3, "SystemServer"
1158
1159      const-string v9, "Throttle Service"
1160 @@ -1016,22 +1055,22 @@
1161      move-object/from16 v0, v91
1162
1163      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
1164 -    :try_end_34b
1165 -    .catch Ljava/lang/Throwable; {:try_start_33d .. :try_end_34b} :catch_6ea
1166 +    :try_end_350
1167 +    .catch Ljava/lang/Throwable; {:try_start_342 .. :try_end_350} :catch_6ef
1168
1169 -    :try_start_34b
1170 +    :try_start_350
1171      const-string v3, "throttle"
1172
1173      move-object/from16 v0, v91
1174
1175      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1176 -    :try_end_352
1177 -    .catch Ljava/lang/Throwable; {:try_start_34b .. :try_end_352} :catch_84c
1178 +    :try_end_357
1179 +    .catch Ljava/lang/Throwable; {:try_start_350 .. :try_end_357} :catch_851
1180
1181      move-object/from16 v90, v91
1182
1183 -    :goto_354
1184 -    :try_start_354
1185 +    :goto_359
1186 +    :try_start_359
1187      const-string v3, "SystemServer"
1188
1189      const-string v9, "Mount Service"
1190 @@ -1045,11 +1084,11 @@
1191      invoke-direct {v9, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
1192
1193      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1194 -    :try_end_365
1195 -    .catch Ljava/lang/Throwable; {:try_start_354 .. :try_end_365} :catch_6f6
1196 +    :try_end_36a
1197 +    .catch Ljava/lang/Throwable; {:try_start_359 .. :try_end_36a} :catch_6fb
1198
1199 -    :goto_365
1200 -    :try_start_365
1201 +    :goto_36a
1202 +    :try_start_36a
1203      const-string v3, "SystemServer"
1204
1205      const-string v9, "Notification Manager"
1206 @@ -1065,10 +1104,10 @@
1207      move-object/from16 v2, v67
1208
1209      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
1210 -    :try_end_377
1211 -    .catch Ljava/lang/Throwable; {:try_start_365 .. :try_end_377} :catch_702
1212 +    :try_end_37c
1213 +    .catch Ljava/lang/Throwable; {:try_start_36a .. :try_end_37c} :catch_707
1214
1215 -    :try_start_377
1216 +    :try_start_37c
1217      const-string v3, "notification"
1218
1219      move-object/from16 v0, v77
1220 @@ -1078,17 +1117,17 @@
1221      move-object/from16 v0, v77
1222
1223      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
1224 -    :try_end_383
1225 -    .catch Ljava/lang/Throwable; {:try_start_377 .. :try_end_383} :catch_847
1226 +    :try_end_388
1227 +    .catch Ljava/lang/Throwable; {:try_start_37c .. :try_end_388} :catch_84c
1228
1229      move-object/from16 v76, v77
1230
1231 -    :goto_385
1232 +    :goto_38a
1233      sget-boolean v3, Landroid/os/SystemProperties;->QCOM_HDMI_OUT:Z
1234
1235 -    if-eqz v3, :cond_39a
1236 +    if-eqz v3, :cond_39f
1237
1238 -    :try_start_389
1239 +    :try_start_38e
1240      const-string v3, "SystemServer"
1241
1242      const-string v9, "HDMI Service"
1243 @@ -1102,12 +1141,12 @@
1244      invoke-direct {v9, v4}, Lcom/android/server/HDMIService;-><init>(Landroid/content/Context;)V
1245
1246      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1247 -    :try_end_39a
1248 -    .catch Ljava/lang/Throwable; {:try_start_389 .. :try_end_39a} :catch_70e
1249 +    :try_end_39f
1250 +    .catch Ljava/lang/Throwable; {:try_start_38e .. :try_end_39f} :catch_713
1251
1252 -    :cond_39a
1253 -    :goto_39a
1254 -    :try_start_39a
1255 +    :cond_39f
1256 +    :goto_39f
1257 +    :try_start_39f
1258      const-string v3, "SystemServer"
1259
1260      const-string v9, "Device Storage Monitor"
1261 @@ -1121,11 +1160,11 @@
1262      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
1263
1264      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1265 -    :try_end_3ab
1266 -    .catch Ljava/lang/Throwable; {:try_start_39a .. :try_end_3ab} :catch_71a
1267 +    :try_end_3b0
1268 +    .catch Ljava/lang/Throwable; {:try_start_39f .. :try_end_3b0} :catch_71f
1269
1270 -    :goto_3ab
1271 -    :try_start_3ab
1272 +    :goto_3b0
1273 +    :try_start_3b0
1274      const-string v3, "SystemServer"
1275
1276      const-string v9, "Location Manager"
1277 @@ -1137,22 +1176,22 @@
1278      move-object/from16 v0, v70
1279
1280      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
1281 -    :try_end_3b9
1282 -    .catch Ljava/lang/Throwable; {:try_start_3ab .. :try_end_3b9} :catch_726
1283 +    :try_end_3be
1284 +    .catch Ljava/lang/Throwable; {:try_start_3b0 .. :try_end_3be} :catch_72b
1285
1286 -    :try_start_3b9
1287 +    :try_start_3be
1288      const-string v3, "location"
1289
1290      move-object/from16 v0, v70
1291
1292      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1293 -    :try_end_3c0
1294 -    .catch Ljava/lang/Throwable; {:try_start_3b9 .. :try_end_3c0} :catch_842
1295 +    :try_end_3c5
1296 +    .catch Ljava/lang/Throwable; {:try_start_3be .. :try_end_3c5} :catch_847
1297
1298      move-object/from16 v69, v70
1299
1300 -    :goto_3c2
1301 -    :try_start_3c2
1302 +    :goto_3c7
1303 +    :try_start_3c7
1304      const-string v3, "SystemServer"
1305
1306      const-string v9, "Country Detector"
1307 @@ -1164,22 +1203,22 @@
1308      move-object/from16 v0, v51
1309
1310      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
1311 -    :try_end_3d0
1312 -    .catch Ljava/lang/Throwable; {:try_start_3c2 .. :try_end_3d0} :catch_732
1313 +    :try_end_3d5
1314 +    .catch Ljava/lang/Throwable; {:try_start_3c7 .. :try_end_3d5} :catch_737
1315
1316 -    :try_start_3d0
1317 +    :try_start_3d5
1318      const-string v3, "country_detector"
1319
1320      move-object/from16 v0, v51
1321
1322      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1323 -    :try_end_3d7
1324 -    .catch Ljava/lang/Throwable; {:try_start_3d0 .. :try_end_3d7} :catch_83d
1325 +    :try_end_3dc
1326 +    .catch Ljava/lang/Throwable; {:try_start_3d5 .. :try_end_3dc} :catch_842
1327
1328      move-object/from16 v50, v51
1329
1330 -    :goto_3d9
1331 -    :try_start_3d9
1332 +    :goto_3de
1333 +    :try_start_3de
1334      const-string v3, "SystemServer"
1335
1336      const-string v9, "Search Service"
1337 @@ -1193,11 +1232,11 @@
1338      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
1339
1340      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1341 -    :try_end_3ea
1342 -    .catch Ljava/lang/Throwable; {:try_start_3d9 .. :try_end_3ea} :catch_73e
1343 +    :try_end_3ef
1344 +    .catch Ljava/lang/Throwable; {:try_start_3de .. :try_end_3ef} :catch_743
1345
1346 -    :goto_3ea
1347 -    :try_start_3ea
1348 +    :goto_3ef
1349 +    :try_start_3ef
1350      const-string v3, "SystemServer"
1351
1352      const-string v9, "DropBox Service"
1353 @@ -1217,11 +1256,11 @@
1354      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
1355
1356      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1357 -    :try_end_402
1358 -    .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_402} :catch_74a
1359 +    :try_end_407
1360 +    .catch Ljava/lang/Throwable; {:try_start_3ef .. :try_end_407} :catch_74f
1361
1362 -    :goto_402
1363 -    :try_start_402
1364 +    :goto_407
1365 +    :try_start_407
1366      const-string v3, "SystemServer"
1367
1368      const-string v9, "Wallpaper Service"
1369 @@ -1233,22 +1272,22 @@
1370      move-object/from16 v0, v100
1371
1372      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
1373 -    :try_end_410
1374 -    .catch Ljava/lang/Throwable; {:try_start_402 .. :try_end_410} :catch_756
1375 +    :try_end_415
1376 +    .catch Ljava/lang/Throwable; {:try_start_407 .. :try_end_415} :catch_75b
1377
1378 -    :try_start_410
1379 +    :try_start_415
1380      const-string v3, "wallpaper"
1381
1382      move-object/from16 v0, v100
1383
1384      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1385 -    :try_end_417
1386 -    .catch Ljava/lang/Throwable; {:try_start_410 .. :try_end_417} :catch_838
1387 +    :try_end_41c
1388 +    .catch Ljava/lang/Throwable; {:try_start_415 .. :try_end_41c} :catch_83d
1389
1390      move-object/from16 v99, v100
1391
1392 -    :goto_419
1393 -    :try_start_419
1394 +    :goto_41e
1395 +    :try_start_41e
1396      const-string v3, "SystemServer"
1397
1398      const-string v9, "Audio Service"
1399 @@ -1262,11 +1301,11 @@
1400      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
1401
1402      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1403 -    :try_end_42a
1404 -    .catch Ljava/lang/Throwable; {:try_start_419 .. :try_end_42a} :catch_762
1405 +    :try_end_42f
1406 +    .catch Ljava/lang/Throwable; {:try_start_41e .. :try_end_42f} :catch_767
1407
1408 -    :goto_42a
1409 -    :try_start_42a
1410 +    :goto_42f
1411 +    :try_start_42f
1412      const-string v3, "SystemServer"
1413
1414      const-string v9, "Dock Observer"
1415 @@ -1278,13 +1317,13 @@
1416      move-object/from16 v0, v60
1417
1418      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
1419 -    :try_end_438
1420 -    .catch Ljava/lang/Throwable; {:try_start_42a .. :try_end_438} :catch_76e
1421 +    :try_end_43d
1422 +    .catch Ljava/lang/Throwable; {:try_start_42f .. :try_end_43d} :catch_773
1423
1424      move-object/from16 v59, v60
1425
1426 -    :goto_43a
1427 -    :try_start_43a
1428 +    :goto_43f
1429 +    :try_start_43f
1430      const-string v3, "SystemServer"
1431
1432      const-string v9, "Wired Accessory Observer"
1433 @@ -1294,11 +1333,11 @@
1434      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
1435
1436      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
1437 -    :try_end_446
1438 -    .catch Ljava/lang/Throwable; {:try_start_43a .. :try_end_446} :catch_77a
1439 +    :try_end_44b
1440 +    .catch Ljava/lang/Throwable; {:try_start_43f .. :try_end_44b} :catch_77f
1441
1442 -    :goto_446
1443 -    :try_start_446
1444 +    :goto_44b
1445 +    :try_start_44b
1446      const-string v3, "SystemServer"
1447
1448      const-string v9, "USB Service"
1449 @@ -1310,22 +1349,22 @@
1450      move-object/from16 v0, v97
1451
1452      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
1453 -    :try_end_454
1454 -    .catch Ljava/lang/Throwable; {:try_start_446 .. :try_end_454} :catch_786
1455 +    :try_end_459
1456 +    .catch Ljava/lang/Throwable; {:try_start_44b .. :try_end_459} :catch_78b
1457
1458 -    :try_start_454
1459 +    :try_start_459
1460      const-string v3, "usb"
1461
1462      move-object/from16 v0, v97
1463
1464      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1465 -    :try_end_45b
1466 -    .catch Ljava/lang/Throwable; {:try_start_454 .. :try_end_45b} :catch_833
1467 +    :try_end_460
1468 +    .catch Ljava/lang/Throwable; {:try_start_459 .. :try_end_460} :catch_838
1469
1470      move-object/from16 v96, v97
1471
1472 -    :goto_45d
1473 -    :try_start_45d
1474 +    :goto_462
1475 +    :try_start_462
1476      const-string v3, "SystemServer"
1477
1478      const-string v9, "UI Mode Manager Service"
1479 @@ -1337,13 +1376,13 @@
1480      move-object/from16 v0, v95
1481
1482      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
1483 -    :try_end_46b
1484 -    .catch Ljava/lang/Throwable; {:try_start_45d .. :try_end_46b} :catch_792
1485 +    :try_end_470
1486 +    .catch Ljava/lang/Throwable; {:try_start_462 .. :try_end_470} :catch_797
1487
1488      move-object/from16 v94, v95
1489
1490 -    :goto_46d
1491 -    :try_start_46d
1492 +    :goto_472
1493 +    :try_start_472
1494      const-string v3, "SystemServer"
1495
1496      const-string v9, "Backup Service"
1497 @@ -1357,11 +1396,11 @@
1498      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
1499
1500      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1501 -    :try_end_47e
1502 -    .catch Ljava/lang/Throwable; {:try_start_46d .. :try_end_47e} :catch_79e
1503 +    :try_end_483
1504 +    .catch Ljava/lang/Throwable; {:try_start_472 .. :try_end_483} :catch_7a3
1505
1506 -    :goto_47e
1507 -    :try_start_47e
1508 +    :goto_483
1509 +    :try_start_483
1510      const-string v3, "SystemServer"
1511
1512      const-string v9, "AppWidget Service"
1513 @@ -1373,22 +1412,22 @@
1514      move-object/from16 v0, v40
1515
1516      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
1517 -    :try_end_48c
1518 -    .catch Ljava/lang/Throwable; {:try_start_47e .. :try_end_48c} :catch_7aa
1519 +    :try_end_491
1520 +    .catch Ljava/lang/Throwable; {:try_start_483 .. :try_end_491} :catch_7af
1521
1522 -    :try_start_48c
1523 +    :try_start_491
1524      const-string v3, "appwidget"
1525
1526      move-object/from16 v0, v40
1527
1528      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1529 -    :try_end_493
1530 -    .catch Ljava/lang/Throwable; {:try_start_48c .. :try_end_493} :catch_82e
1531 +    :try_end_498
1532 +    .catch Ljava/lang/Throwable; {:try_start_491 .. :try_end_498} :catch_833
1533
1534      move-object/from16 v39, v40
1535
1536 -    :goto_495
1537 -    :try_start_495
1538 +    :goto_49a
1539 +    :try_start_49a
1540      const-string v3, "SystemServer"
1541
1542      const-string v9, "Recognition Service"
1543 @@ -1400,13 +1439,13 @@
1544      move-object/from16 v0, v86
1545
1546      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
1547 -    :try_end_4a3
1548 -    .catch Ljava/lang/Throwable; {:try_start_495 .. :try_end_4a3} :catch_7b6
1549 +    :try_end_4a8
1550 +    .catch Ljava/lang/Throwable; {:try_start_49a .. :try_end_4a8} :catch_7bb
1551
1552      move-object/from16 v85, v86
1553
1554 -    :goto_4a5
1555 -    :try_start_4a5
1556 +    :goto_4aa
1557 +    :try_start_4aa
1558      const-string v3, "SystemServer"
1559
1560      const-string v9, "DiskStats Service"
1561 @@ -1420,11 +1459,11 @@
1562      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
1563
1564      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1565 -    :try_end_4b6
1566 -    .catch Ljava/lang/Throwable; {:try_start_4a5 .. :try_end_4b6} :catch_7c2
1567 +    :try_end_4bb
1568 +    .catch Ljava/lang/Throwable; {:try_start_4aa .. :try_end_4bb} :catch_7c7
1569
1570 -    :goto_4b6
1571 -    :try_start_4b6
1572 +    :goto_4bb
1573 +    :try_start_4bb
1574      const-string v3, "SystemServer"
1575
1576      const-string v9, "SamplingProfiler Service"
1577 @@ -1438,11 +1477,11 @@
1578      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
1579
1580      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1581 -    :try_end_4c7
1582 -    .catch Ljava/lang/Throwable; {:try_start_4b6 .. :try_end_4c7} :catch_7ce
1583 +    :try_end_4cc
1584 +    .catch Ljava/lang/Throwable; {:try_start_4bb .. :try_end_4cc} :catch_7d3
1585
1586 -    :goto_4c7
1587 -    :try_start_4c7
1588 +    :goto_4cc
1589 +    :try_start_4cc
1590      const-string v3, "SystemServer"
1591
1592      const-string v9, "NetworkTimeUpdateService"
1593 @@ -1454,13 +1493,13 @@
1594      move-object/from16 v0, v75
1595
1596      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
1597 -    :try_end_4d5
1598 -    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d5} :catch_7da
1599 +    :try_end_4da
1600 +    .catch Ljava/lang/Throwable; {:try_start_4cc .. :try_end_4da} :catch_7df
1601
1602      move-object/from16 v74, v75
1603
1604 -    :goto_4d7
1605 -    :try_start_4d7
1606 +    :goto_4dc
1607 +    :try_start_4dc
1608      const-string v3, "SystemServer"
1609
1610      const-string v9, "PowerSaverService"
1611 @@ -1472,17 +1511,17 @@
1612      move-object/from16 v0, v82
1613
1614      invoke-direct {v0, v4}, Landroid/server/PowerSaverService;-><init>(Landroid/content/Context;)V
1615 -    :try_end_4e5
1616 -    .catch Ljava/lang/Throwable; {:try_start_4d7 .. :try_end_4e5} :catch_7e6
1617 +    :try_end_4ea
1618 +    .catch Ljava/lang/Throwable; {:try_start_4dc .. :try_end_4ea} :catch_7eb
1619
1620      move-object/from16 v81, v82
1621
1622 -    :goto_4e7
1623 +    :goto_4ec
1624      invoke-virtual/range {v105 .. v105}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
1625
1626      move-result v27
1627
1628 -    if-eqz v27, :cond_7f2
1629 +    if-eqz v27, :cond_7f7
1630
1631      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
1632
1633 @@ -1500,32 +1539,32 @@
1634
1635      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
1636
1637 -    :goto_4fe
1638 -    if-eqz v55, :cond_503
1639 -
1640 -    :try_start_500
1641 -    invoke-virtual/range {v55 .. v55}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
1642 -    :try_end_503
1643 -    .catch Ljava/lang/Throwable; {:try_start_500 .. :try_end_503} :catch_7fb
1644 -
1645 -    :cond_503
1646      :goto_503
1647 -    if-eqz v76, :cond_508
1648 +    if-eqz v55, :cond_508
1649
1650      :try_start_505
1651 -    invoke-virtual/range {v76 .. v76}, Lcom/android/server/NotificationManagerService;->systemReady()V
1652 +    invoke-virtual/range {v55 .. v55}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
1653      :try_end_508
1654 -    .catch Ljava/lang/Throwable; {:try_start_505 .. :try_end_508} :catch_807
1655 +    .catch Ljava/lang/Throwable; {:try_start_505 .. :try_end_508} :catch_800
1656
1657      :cond_508
1658      :goto_508
1659 -    :try_start_508
1660 +    if-eqz v76, :cond_50d
1661 +
1662 +    :try_start_50a
1663 +    invoke-virtual/range {v76 .. v76}, Lcom/android/server/NotificationManagerService;->systemReady()V
1664 +    :try_end_50d
1665 +    .catch Ljava/lang/Throwable; {:try_start_50a .. :try_end_50d} :catch_80c
1666 +
1667 +    :cond_50d
1668 +    :goto_50d
1669 +    :try_start_50d
1670      invoke-virtual/range {v105 .. v105}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
1671 -    :try_end_50b
1672 -    .catch Ljava/lang/Throwable; {:try_start_508 .. :try_end_50b} :catch_813
1673 +    :try_end_510
1674 +    .catch Ljava/lang/Throwable; {:try_start_50d .. :try_end_510} :catch_818
1675
1676 -    :goto_50b
1677 -    if-eqz v27, :cond_514
1678 +    :goto_510
1679 +    if-eqz v27, :cond_519
1680
1681      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
1682
1683 @@ -1533,7 +1572,7 @@
1684
1685      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
1686
1687 -    :cond_514
1688 +    :cond_519
1689      invoke-virtual/range {v105 .. v105}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
1690
1691      move-result-object v47
1692 @@ -1570,12 +1609,12 @@
1693
1694      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
1695
1696 -    :try_start_53c
1697 +    :try_start_541
1698      invoke-interface/range {v79 .. v79}, Landroid/content/pm/IPackageManager;->systemReady()V
1699 -    :try_end_53f
1700 -    .catch Ljava/lang/Throwable; {:try_start_53c .. :try_end_53f} :catch_81f
1701 +    :try_end_544
1702 +    .catch Ljava/lang/Throwable; {:try_start_541 .. :try_end_544} :catch_824
1703
1704 -    :goto_53f
1705 +    :goto_544
1706      move-object/from16 v16, v4
1707
1708      move-object/from16 v17, v5
1709 @@ -1632,7 +1671,7 @@
1710
1711      move-result v3
1712
1713 -    if-eqz v3, :cond_582
1714 +    if-eqz v3, :cond_587
1715
1716      const-string v3, "SystemServer"
1717
1718 @@ -1640,7 +1679,7 @@
1719
1720      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1721
1722 -    :cond_582
1723 +    :cond_587
1724      invoke-static {}, Landroid/os/Looper;->loop()V
1725
1726      const-string v3, "SystemServer"
1727 @@ -1651,25 +1690,25 @@
1728
1729      return-void
1730
1731 -    :cond_58d
1732 +    :cond_592
1733      const/16 v84, 0x0
1734
1735      goto/16 :goto_35
1736
1737 -    :cond_591
1738 +    :cond_596
1739      const/16 v83, 0x0
1740
1741      goto/16 :goto_47
1742
1743 -    :cond_595
1744 +    :cond_59a
1745      invoke-static/range {v63 .. v63}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
1746
1747      move-result v62
1748
1749      goto/16 :goto_60
1750
1751 -    :cond_59b
1752 -    :try_start_59b
1753 +    :cond_5a0
1754 +    :try_start_5a0
1755      const-string v3, "1"
1756
1757      move-object/from16 v0, v54
1758 @@ -1690,12 +1729,12 @@
1759
1760      goto/16 :goto_ee
1761
1762 -    :cond_5b0
1763 +    :cond_5b5
1764      const/4 v3, 0x0
1765
1766      goto/16 :goto_f1
1767
1768 -    :catch_5b3
1769 +    :catch_5b8
1770      move-exception v61
1771
1772      const-string v3, "SystemServer"
1773 @@ -1705,19 +1744,19 @@
1774      move-object/from16 v0, v61
1775
1776      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1777 -    :try_end_5bd
1778 -    .catch Ljava/lang/RuntimeException; {:try_start_59b .. :try_end_5bd} :catch_5bf
1779 +    :try_end_5c2
1780 +    .catch Ljava/lang/RuntimeException; {:try_start_5a0 .. :try_end_5c2} :catch_5c4
1781
1782      goto/16 :goto_119
1783
1784 -    :catch_5bf
1785 +    :catch_5c4
1786      move-exception v61
1787
1788      move-object/from16 v7, v38
1789
1790      move-object/from16 v5, v41
1791
1792 -    :goto_5c4
1793 +    :goto_5c9
1794      const-string v3, "System"
1795
1796      const-string v9, "******************************************"
1797 @@ -1732,49 +1771,49 @@
1798
1799      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1800
1801 -    goto/16 :goto_1f3
1802 +    goto/16 :goto_1f8
1803
1804 -    :cond_5d6
1805 +    :cond_5db
1806      const/4 v3, 0x0
1807
1808      goto/16 :goto_126
1809
1810 -    :cond_5d9
1811 +    :cond_5de
1812      const/4 v3, 0x0
1813
1814      move v9, v3
1815
1816 -    goto/16 :goto_19f
1817 +    goto/16 :goto_1a4
1818
1819 -    :cond_5dd
1820 +    :cond_5e2
1821      const/4 v3, 0x0
1822
1823 -    goto/16 :goto_1a2
1824 +    goto/16 :goto_1a7
1825
1826 -    :cond_5e0
1827 +    :cond_5e5
1828      const/4 v3, 0x1
1829
1830      move/from16 v0, v62
1831
1832 -    if-ne v0, v3, :cond_5f2
1833 +    if-ne v0, v3, :cond_5f7
1834
1835 -    :try_start_5e5
1836 +    :try_start_5ea
1837      const-string v3, "SystemServer"
1838
1839      const-string v9, "No Bluetooth Service (factory test)"
1840
1841      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1842
1843 -    goto/16 :goto_1cb
1844 +    goto/16 :goto_1d0
1845
1846 -    :catch_5ee
1847 +    :catch_5f3
1848      move-exception v61
1849
1850      move-object/from16 v67, v68
1851
1852 -    goto :goto_5c4
1853 +    goto :goto_5c9
1854
1855 -    :cond_5f2
1856 +    :cond_5f7
1857      const-string v3, "SystemServer"
1858
1859      const-string v9, "Bluetooth Service"
1860 @@ -1786,10 +1825,10 @@
1861      move-object/from16 v0, v43
1862
1863      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
1864 -    :try_end_600
1865 -    .catch Ljava/lang/RuntimeException; {:try_start_5e5 .. :try_end_600} :catch_5ee
1866 +    :try_end_605
1867 +    .catch Ljava/lang/RuntimeException; {:try_start_5ea .. :try_end_605} :catch_5f3
1868
1869 -    :try_start_600
1870 +    :try_start_605
1871      const-string v3, "bluetooth"
1872
1873      move-object/from16 v0, v43
1874 @@ -1805,10 +1844,10 @@
1875      move-object/from16 v1, v43
1876
1877      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
1878 -    :try_end_613
1879 -    .catch Ljava/lang/RuntimeException; {:try_start_600 .. :try_end_613} :catch_898
1880 +    :try_end_618
1881 +    .catch Ljava/lang/RuntimeException; {:try_start_605 .. :try_end_618} :catch_89d
1882
1883 -    :try_start_613
1884 +    :try_start_618
1885      const-string v3, "bluetooth_a2dp"
1886
1887      move-object/from16 v0, v45
1888 @@ -1841,25 +1880,25 @@
1889
1890      move-result v46
1891
1892 -    if-nez v37, :cond_63a
1893 +    if-nez v37, :cond_63f
1894
1895 -    if-eqz v46, :cond_63a
1896 +    if-eqz v46, :cond_63f
1897
1898      invoke-virtual/range {v43 .. v43}, Landroid/server/BluetoothService;->enable()Z
1899 -    :try_end_63a
1900 -    .catch Ljava/lang/RuntimeException; {:try_start_613 .. :try_end_63a} :catch_89f
1901 +    :try_end_63f
1902 +    .catch Ljava/lang/RuntimeException; {:try_start_618 .. :try_end_63f} :catch_8a4
1903
1904 -    :cond_63a
1905 +    :cond_63f
1906      move-object/from16 v44, v45
1907
1908      move-object/from16 v42, v43
1909
1910 -    goto/16 :goto_1cb
1911 +    goto/16 :goto_1d0
1912
1913 -    :catch_640
1914 +    :catch_645
1915      move-exception v61
1916
1917 -    :goto_641
1918 +    :goto_646
1919      const-string v3, "starting Input Manager Service"
1920
1921      move-object/from16 v0, p0
1922 @@ -1868,9 +1907,9 @@
1923
1924      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1925
1926 -    goto/16 :goto_223
1927 +    goto/16 :goto_228
1928
1929 -    :catch_64c
1930 +    :catch_651
1931      move-exception v61
1932
1933      const-string v3, "starting Accessibility Manager"
1934 @@ -1881,9 +1920,9 @@
1935
1936      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1937
1938 -    goto/16 :goto_234
1939 +    goto/16 :goto_239
1940
1941 -    :catch_658
1942 +    :catch_65d
1943      move-exception v61
1944
1945      const-string v3, "making display ready"
1946 @@ -1894,9 +1933,9 @@
1947
1948      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1949
1950 -    goto/16 :goto_237
1951 +    goto/16 :goto_23c
1952
1953 -    :catch_664
1954 +    :catch_669
1955      move-exception v61
1956
1957      const-string v3, "performing boot dexopt"
1958 @@ -1907,12 +1946,12 @@
1959
1960      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1961
1962 -    goto/16 :goto_23a
1963 +    goto/16 :goto_23f
1964
1965 -    :catch_670
1966 +    :catch_675
1967      move-exception v61
1968
1969 -    :goto_671
1970 +    :goto_676
1971      const-string v3, "starting DevicePolicyService"
1972
1973      move-object/from16 v0, p0
1974 @@ -1921,12 +1960,12 @@
1975
1976      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1977
1978 -    goto/16 :goto_269
1979 +    goto/16 :goto_26e
1980
1981 -    :catch_67c
1982 +    :catch_681
1983      move-exception v61
1984
1985 -    :goto_67d
1986 +    :goto_682
1987      const-string v3, "starting StatusBarManagerService"
1988
1989      move-object/from16 v0, p0
1990 @@ -1935,9 +1974,9 @@
1991
1992      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
1993
1994 -    goto/16 :goto_282
1995 +    goto/16 :goto_287
1996
1997 -    :catch_688
1998 +    :catch_68d
1999      move-exception v61
2000
2001      const-string v3, "starting Clipboard Service"
2002 @@ -1948,9 +1987,9 @@
2003
2004      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2005
2006 -    goto/16 :goto_293
2007 +    goto/16 :goto_298
2008
2009 -    :catch_694
2010 +    :catch_699
2011      move-exception v61
2012
2013      const-string v3, "starting NetworkManagement Service"
2014 @@ -1961,12 +2000,12 @@
2015
2016      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2017
2018 -    goto/16 :goto_2a3
2019 +    goto/16 :goto_2a8
2020
2021 -    :catch_6a0
2022 +    :catch_6a5
2023      move-exception v61
2024
2025 -    :goto_6a1
2026 +    :goto_6a6
2027      const-string v3, "starting Text Service Manager Service"
2028
2029      move-object/from16 v0, p0
2030 @@ -1975,12 +2014,12 @@
2031
2032      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2033
2034 -    goto/16 :goto_2ba
2035 +    goto/16 :goto_2bf
2036
2037 -    :catch_6ac
2038 +    :catch_6b1
2039      move-exception v61
2040
2041 -    :goto_6ad
2042 +    :goto_6b2
2043      const-string v3, "starting NetworkStats Service"
2044
2045      move-object/from16 v0, p0
2046 @@ -1989,14 +2028,14 @@
2047
2048      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2049
2050 -    goto/16 :goto_2d1
2051 +    goto/16 :goto_2d6
2052
2053 -    :catch_6b8
2054 +    :catch_6bd
2055      move-exception v61
2056
2057      move-object/from16 v8, v72
2058
2059 -    :goto_6bb
2060 +    :goto_6c0
2061      const-string v3, "starting NetworkPolicy Service"
2062
2063      move-object/from16 v0, p0
2064 @@ -2005,12 +2044,12 @@
2065
2066      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2067
2068 -    goto/16 :goto_2e8
2069 +    goto/16 :goto_2ed
2070
2071 -    :catch_6c6
2072 +    :catch_6cb
2073      move-exception v61
2074
2075 -    :goto_6c7
2076 +    :goto_6cc
2077      const-string v3, "starting Wi-Fi P2pService"
2078
2079      move-object/from16 v0, p0
2080 @@ -2019,12 +2058,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_2ff
2085 +    goto/16 :goto_304
2086
2087 -    :catch_6d2
2088 +    :catch_6d7
2089      move-exception v61
2090
2091 -    :goto_6d3
2092 +    :goto_6d8
2093      const-string v3, "starting Wi-Fi Service"
2094
2095      move-object/from16 v0, p0
2096 @@ -2033,12 +2072,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_316
2101 +    goto/16 :goto_31b
2102
2103 -    :catch_6de
2104 +    :catch_6e3
2105      move-exception v61
2106
2107 -    :goto_6df
2108 +    :goto_6e4
2109      const-string v3, "starting Connectivity Service"
2110
2111      move-object/from16 v0, p0
2112 @@ -2047,12 +2086,12 @@
2113
2114      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2115
2116 -    goto/16 :goto_33d
2117 +    goto/16 :goto_342
2118
2119 -    :catch_6ea
2120 +    :catch_6ef
2121      move-exception v61
2122
2123 -    :goto_6eb
2124 +    :goto_6f0
2125      const-string v3, "starting ThrottleService"
2126
2127      move-object/from16 v0, p0
2128 @@ -2061,9 +2100,9 @@
2129
2130      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2131
2132 -    goto/16 :goto_354
2133 +    goto/16 :goto_359
2134
2135 -    :catch_6f6
2136 +    :catch_6fb
2137      move-exception v61
2138
2139      const-string v3, "starting Mount Service"
2140 @@ -2074,12 +2113,12 @@
2141
2142      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2143
2144 -    goto/16 :goto_365
2145 +    goto/16 :goto_36a
2146
2147 -    :catch_702
2148 +    :catch_707
2149      move-exception v61
2150
2151 -    :goto_703
2152 +    :goto_708
2153      const-string v3, "starting Notification Manager"
2154
2155      move-object/from16 v0, p0
2156 @@ -2088,9 +2127,9 @@
2157
2158      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2159
2160 -    goto/16 :goto_385
2161 +    goto/16 :goto_38a
2162
2163 -    :catch_70e
2164 +    :catch_713
2165      move-exception v61
2166
2167      const-string v3, "SystemServer"
2168 @@ -2101,9 +2140,9 @@
2169
2170      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2171
2172 -    goto/16 :goto_39a
2173 +    goto/16 :goto_39f
2174
2175 -    :catch_71a
2176 +    :catch_71f
2177      move-exception v61
2178
2179      const-string v3, "starting DeviceStorageMonitor service"
2180 @@ -2114,12 +2153,12 @@
2181
2182      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2183
2184 -    goto/16 :goto_3ab
2185 +    goto/16 :goto_3b0
2186
2187 -    :catch_726
2188 +    :catch_72b
2189      move-exception v61
2190
2191 -    :goto_727
2192 +    :goto_72c
2193      const-string v3, "starting Location Manager"
2194
2195      move-object/from16 v0, p0
2196 @@ -2128,12 +2167,12 @@
2197
2198      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2199
2200 -    goto/16 :goto_3c2
2201 +    goto/16 :goto_3c7
2202
2203 -    :catch_732
2204 +    :catch_737
2205      move-exception v61
2206
2207 -    :goto_733
2208 +    :goto_738
2209      const-string v3, "starting Country Detector"
2210
2211      move-object/from16 v0, p0
2212 @@ -2142,9 +2181,9 @@
2213
2214      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2215
2216 -    goto/16 :goto_3d9
2217 +    goto/16 :goto_3de
2218
2219 -    :catch_73e
2220 +    :catch_743
2221      move-exception v61
2222
2223      const-string v3, "starting Search Service"
2224 @@ -2155,9 +2194,9 @@
2225
2226      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2227
2228 -    goto/16 :goto_3ea
2229 +    goto/16 :goto_3ef
2230
2231 -    :catch_74a
2232 +    :catch_74f
2233      move-exception v61
2234
2235      const-string v3, "starting DropBoxManagerService"
2236 @@ -2168,12 +2207,12 @@
2237
2238      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2239
2240 -    goto/16 :goto_402
2241 +    goto/16 :goto_407
2242
2243 -    :catch_756
2244 +    :catch_75b
2245      move-exception v61
2246
2247 -    :goto_757
2248 +    :goto_75c
2249      const-string v3, "starting Wallpaper Service"
2250
2251      move-object/from16 v0, p0
2252 @@ -2182,9 +2221,9 @@
2253
2254      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2255
2256 -    goto/16 :goto_419
2257 +    goto/16 :goto_41e
2258
2259 -    :catch_762
2260 +    :catch_767
2261      move-exception v61
2262
2263      const-string v3, "starting Audio Service"
2264 @@ -2195,9 +2234,9 @@
2265
2266      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2267
2268 -    goto/16 :goto_42a
2269 +    goto/16 :goto_42f
2270
2271 -    :catch_76e
2272 +    :catch_773
2273      move-exception v61
2274
2275      const-string v3, "starting DockObserver"
2276 @@ -2208,9 +2247,9 @@
2277
2278      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2279
2280 -    goto/16 :goto_43a
2281 +    goto/16 :goto_43f
2282
2283 -    :catch_77a
2284 +    :catch_77f
2285      move-exception v61
2286
2287      const-string v3, "starting WiredAccessoryObserver"
2288 @@ -2221,12 +2260,12 @@
2289
2290      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2291
2292 -    goto/16 :goto_446
2293 +    goto/16 :goto_44b
2294
2295 -    :catch_786
2296 +    :catch_78b
2297      move-exception v61
2298
2299 -    :goto_787
2300 +    :goto_78c
2301      const-string v3, "starting UsbService"
2302
2303      move-object/from16 v0, p0
2304 @@ -2235,9 +2274,9 @@
2305
2306      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2307
2308 -    goto/16 :goto_45d
2309 +    goto/16 :goto_462
2310
2311 -    :catch_792
2312 +    :catch_797
2313      move-exception v61
2314
2315      const-string v3, "starting UiModeManagerService"
2316 @@ -2248,9 +2287,9 @@
2317
2318      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2319
2320 -    goto/16 :goto_46d
2321 +    goto/16 :goto_472
2322
2323 -    :catch_79e
2324 +    :catch_7a3
2325      move-exception v61
2326
2327      const-string v3, "SystemServer"
2328 @@ -2261,12 +2300,12 @@
2329
2330      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2331
2332 -    goto/16 :goto_47e
2333 +    goto/16 :goto_483
2334
2335 -    :catch_7aa
2336 +    :catch_7af
2337      move-exception v61
2338
2339 -    :goto_7ab
2340 +    :goto_7b0
2341      const-string v3, "starting AppWidget Service"
2342
2343      move-object/from16 v0, p0
2344 @@ -2275,9 +2314,9 @@
2345
2346      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2347
2348 -    goto/16 :goto_495
2349 +    goto/16 :goto_49a
2350
2351 -    :catch_7b6
2352 +    :catch_7bb
2353      move-exception v61
2354
2355      const-string v3, "starting Recognition Service"
2356 @@ -2288,9 +2327,9 @@
2357
2358      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2359
2360 -    goto/16 :goto_4a5
2361 +    goto/16 :goto_4aa
2362
2363 -    :catch_7c2
2364 +    :catch_7c7
2365      move-exception v61
2366
2367      const-string v3, "starting DiskStats Service"
2368 @@ -2301,9 +2340,9 @@
2369
2370      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2371
2372 -    goto/16 :goto_4b6
2373 +    goto/16 :goto_4bb
2374
2375 -    :catch_7ce
2376 +    :catch_7d3
2377      move-exception v61
2378
2379      const-string v3, "starting SamplingProfiler Service"
2380 @@ -2314,9 +2353,9 @@
2381
2382      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2383
2384 -    goto/16 :goto_4c7
2385 +    goto/16 :goto_4cc
2386
2387 -    :catch_7da
2388 +    :catch_7df
2389      move-exception v61
2390
2391      const-string v3, "starting NetworkTimeUpdate service"
2392 @@ -2327,9 +2366,9 @@
2393
2394      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2395
2396 -    goto/16 :goto_4d7
2397 +    goto/16 :goto_4dc
2398
2399 -    :catch_7e6
2400 +    :catch_7eb
2401      move-exception v61
2402
2403      const-string v3, "starting PowerSaver service"
2404 @@ -2340,18 +2379,18 @@
2405
2406      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2407
2408 -    goto/16 :goto_4e7
2409 +    goto/16 :goto_4ec
2410
2411 -    :cond_7f2
2412 +    :cond_7f7
2413      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
2414
2415      move-result-object v3
2416
2417      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
2418
2419 -    goto/16 :goto_4fe
2420 +    goto/16 :goto_503
2421
2422 -    :catch_7fb
2423 +    :catch_800
2424      move-exception v61
2425
2426      const-string v3, "making Device Policy Service ready"
2427 @@ -2362,9 +2401,9 @@
2428
2429      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2430
2431 -    goto/16 :goto_503
2432 +    goto/16 :goto_508
2433
2434 -    :catch_807
2435 +    :catch_80c
2436      move-exception v61
2437
2438      const-string v3, "making Notification Service ready"
2439 @@ -2375,9 +2414,9 @@
2440
2441      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2442
2443 -    goto/16 :goto_508
2444 +    goto/16 :goto_50d
2445
2446 -    :catch_813
2447 +    :catch_818
2448      move-exception v61
2449
2450      const-string v3, "making Window Manager Service ready"
2451 @@ -2388,9 +2427,9 @@
2452
2453      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2454
2455 -    goto/16 :goto_50b
2456 +    goto/16 :goto_510
2457
2458 -    :catch_81f
2459 +    :catch_824
2460      move-exception v61
2461
2462      const-string v3, "making Package Manager Service ready"
2463 @@ -2401,129 +2440,129 @@
2464
2465      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2466
2467 -    goto/16 :goto_53f
2468 +    goto/16 :goto_544
2469
2470 -    :catch_82b
2471 +    :catch_830
2472      move-exception v3
2473
2474      goto/16 :goto_fd
2475
2476 -    :catch_82e
2477 +    :catch_833
2478      move-exception v61
2479
2480      move-object/from16 v39, v40
2481
2482 -    goto/16 :goto_7ab
2483 +    goto/16 :goto_7b0
2484
2485 -    :catch_833
2486 +    :catch_838
2487      move-exception v61
2488
2489      move-object/from16 v96, v97
2490
2491 -    goto/16 :goto_787
2492 +    goto/16 :goto_78c
2493
2494 -    :catch_838
2495 +    :catch_83d
2496      move-exception v61
2497
2498      move-object/from16 v99, v100
2499
2500 -    goto/16 :goto_757
2501 +    goto/16 :goto_75c
2502
2503 -    :catch_83d
2504 +    :catch_842
2505      move-exception v61
2506
2507      move-object/from16 v50, v51
2508
2509 -    goto/16 :goto_733
2510 +    goto/16 :goto_738
2511
2512 -    :catch_842
2513 +    :catch_847
2514      move-exception v61
2515
2516      move-object/from16 v69, v70
2517
2518 -    goto/16 :goto_727
2519 +    goto/16 :goto_72c
2520
2521 -    :catch_847
2522 +    :catch_84c
2523      move-exception v61
2524
2525      move-object/from16 v76, v77
2526
2527 -    goto/16 :goto_703
2528 +    goto/16 :goto_708
2529
2530 -    :catch_84c
2531 +    :catch_851
2532      move-exception v61
2533
2534      move-object/from16 v90, v91
2535
2536 -    goto/16 :goto_6eb
2537 +    goto/16 :goto_6f0
2538
2539 -    :catch_851
2540 +    :catch_856
2541      move-exception v61
2542
2543      move-object/from16 v48, v49
2544
2545 -    goto/16 :goto_6df
2546 +    goto/16 :goto_6e4
2547
2548 -    :catch_856
2549 +    :catch_85b
2550      move-exception v61
2551
2552      move-object/from16 v101, v102
2553
2554 -    goto/16 :goto_6d3
2555 +    goto/16 :goto_6d8
2556
2557 -    :catch_85b
2558 +    :catch_860
2559      move-exception v61
2560
2561      move-object/from16 v103, v104
2562
2563 -    goto/16 :goto_6c7
2564 +    goto/16 :goto_6cc
2565
2566 -    :catch_860
2567 +    :catch_865
2568      move-exception v61
2569
2570 -    goto/16 :goto_6bb
2571 +    goto/16 :goto_6c0
2572
2573 -    :catch_863
2574 +    :catch_868
2575      move-exception v61
2576
2577      move-object/from16 v12, v73
2578
2579 -    goto/16 :goto_6ad
2580 +    goto/16 :goto_6b2
2581
2582 -    :catch_868
2583 +    :catch_86d
2584      move-exception v61
2585
2586      move-object/from16 v92, v93
2587
2588 -    goto/16 :goto_6a1
2589 +    goto/16 :goto_6a6
2590
2591 -    :catch_86d
2592 +    :catch_872
2593      move-exception v61
2594
2595      move-object/from16 v88, v89
2596
2597 -    goto/16 :goto_67d
2598 +    goto/16 :goto_682
2599
2600 -    :catch_872
2601 +    :catch_877
2602      move-exception v61
2603
2604      move-object/from16 v55, v56
2605
2606 -    goto/16 :goto_671
2607 +    goto/16 :goto_676
2608
2609 -    :catch_877
2610 +    :catch_87c
2611      move-exception v3
2612
2613 -    goto/16 :goto_24d
2614 +    goto/16 :goto_252
2615
2616 -    :catch_87a
2617 +    :catch_87f
2618      move-exception v61
2619
2620      move-object/from16 v65, v66
2621
2622 -    goto/16 :goto_641
2623 +    goto/16 :goto_646
2624
2625 -    :catch_87f
2626 +    :catch_884
2627      move-exception v61
2628
2629      move-object/from16 v7, v38
2630 @@ -2532,9 +2571,9 @@
2631
2632      move-object/from16 v6, v80
2633
2634 -    goto/16 :goto_5c4
2635 +    goto/16 :goto_5c9
2636
2637 -    :catch_888
2638 +    :catch_88d
2639      move-exception v61
2640
2641      move-object/from16 v7, v38
2642 @@ -2543,27 +2582,27 @@
2643
2644      move-object/from16 v67, v68
2645
2646 -    goto/16 :goto_5c4
2647 +    goto/16 :goto_5c9
2648
2649 -    :catch_891
2650 +    :catch_896
2651      move-exception v61
2652
2653      move-object/from16 v7, v38
2654
2655      move-object/from16 v67, v68
2656
2657 -    goto/16 :goto_5c4
2658 +    goto/16 :goto_5c9
2659
2660 -    :catch_898
2661 +    :catch_89d
2662      move-exception v61
2663
2664      move-object/from16 v42, v43
2665
2666      move-object/from16 v67, v68
2667
2668 -    goto/16 :goto_5c4
2669 +    goto/16 :goto_5c9
2670
2671 -    :catch_89f
2672 +    :catch_8a4
2673      move-exception v61
2674
2675      move-object/from16 v44, v45
2676 @@ -2572,18 +2611,18 @@
2677
2678      move-object/from16 v67, v68
2679
2680 -    goto/16 :goto_5c4
2681 +    goto/16 :goto_5c9
2682
2683 -    :catch_8a8
2684 +    :catch_8ad
2685      move-exception v61
2686
2687      move-object/from16 v57, v58
2688
2689      move-object/from16 v67, v68
2690
2691 -    goto/16 :goto_5c4
2692 +    goto/16 :goto_5c9
2693
2694 -    :catch_8af
2695 +    :catch_8b4
2696      move-exception v61
2697
2698      move-object/from16 v52, v53
2699 @@ -2592,10 +2631,10 @@
2700
2701      move-object/from16 v67, v68
2702
2703 -    goto/16 :goto_5c4
2704 +    goto/16 :goto_5c9
2705
2706 -    :cond_8b8
2707 +    :cond_8bd
2708      move-object/from16 v8, v72
2709
2710 -    goto/16 :goto_4e7
2711 +    goto/16 :goto_4ec
2712  .end method