patches/pdroid/cm10/20121015/services.patch

   1 diff -Npru -x '*RIL*' pdroid-services/smali/com/android/server/am/ActivityManagerService.smali stock-services/smali/com/android/server/am/ActivityManagerService.smali
   2 --- pdroid-services/smali/com/android/server/am/ActivityManagerService.smali    2012-10-13 14:13:23.673760282 -0500
   3 +++ stock-services/smali/com/android/server/am/ActivityManagerService.smali     2012-10-13 14:13:01.689651267 -0500
   4 @@ -41305,7 +41305,7 @@
   5      :try_start_16
   6      monitor-enter p0
   7      :try_end_17
   8 -    .catchall {:try_start_16 .. :try_end_17} :catchall_3b
   9 +    .catchall {:try_start_16 .. :try_end_17} :catchall_42
  10
  11      :try_start_17
  12      invoke-virtual {p0, p1}, Lcom/android/server/am/ActivityManagerService;->broadcastRecordForReceiverLocked(Landroid/os/IBinder;)Lcom/android/server/am/BroadcastRecord;
  13 @@ -41333,40 +41333,46 @@
  14      :cond_28
  15      monitor-exit p0
  16      :try_end_29
  17 -    .catchall {:try_start_17 .. :try_end_29} :catchall_38
  18 +    .catchall {:try_start_17 .. :try_end_29} :catchall_3f
  19
  20 -    if-eqz v7, :cond_31
  21 +    if-eqz v7, :cond_38
  22
  23      :try_start_2b
  24      iget-object v0, v1, Lcom/android/server/am/BroadcastRecord;->queue:Lcom/android/server/am/BroadcastQueue;
  25
  26 +    iget-object v2, p0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
  27 +
  28 +    invoke-virtual {v0, v2}, Lcom/android/server/am/BroadcastQueue;->setContext(Landroid/content/Context;)V
  29 +
  30 +    iget-object v0, v1, Lcom/android/server/am/BroadcastRecord;->queue:Lcom/android/server/am/BroadcastQueue;
  31 +
  32      const/4 v2, 0x0
  33
  34      invoke-virtual {v0, v2}, Lcom/android/server/am/BroadcastQueue;->processNextBroadcast(Z)V
  35
  36 -    :cond_31
  37 +    :cond_38
  38      invoke-virtual {p0}, Lcom/android/server/am/ActivityManagerService;->trimApplications()V
  39 -    :try_end_34
  40 -    .catchall {:try_start_2b .. :try_end_34} :catchall_3b
  41 +    :try_end_3b
  42 +    .catchall {:try_start_2b .. :try_end_3b} :catchall_42
  43
  44      invoke-static {v8, v9}, Landroid/os/Binder;->restoreCallingIdentity(J)V
  45
  46      return-void
  47
  48 -    :catchall_38
  49 +    :catchall_3f
  50      move-exception v0
  51
  52 -    :try_start_39
  53 +    :try_start_40
  54      monitor-exit p0
  55 -    :try_end_3a
  56 -    .catchall {:try_start_39 .. :try_end_3a} :catchall_38
  57 +    :try_end_41
  58 +    .catchall {:try_start_40 .. :try_end_41} :catchall_3f
  59
  60 -    :try_start_3a
  61 +    :try_start_41
  62      throw v0
  63 -    :try_end_3b
  64 -    .catchall {:try_start_3a .. :try_end_3b} :catchall_3b
  65 +    :try_end_42
  66 +    .catchall {:try_start_41 .. :try_end_42} :catchall_42
  67
  68 -    :catchall_3b
  69 +    :catchall_42
  70      move-exception v0
  71
  72      invoke-static {v8, v9}, Landroid/os/Binder;->restoreCallingIdentity(J)V
  73 @@ -59129,7 +59135,7 @@
  74      :try_start_5
  75      monitor-enter p0
  76      :try_end_6
  77 -    .catchall {:try_start_5 .. :try_end_6} :catchall_61
  78 +    .catchall {:try_start_5 .. :try_end_6} :catchall_68
  79
  80      :try_start_6
  81      iget-object v0, p0, Lcom/android/server/am/ActivityManagerService;->mRegisteredReceivers:Ljava/util/HashMap;
  82 @@ -59144,11 +59150,11 @@
  83
  84      check-cast v12, Lcom/android/server/am/ReceiverList;
  85
  86 -    if-eqz v12, :cond_54
  87 +    if-eqz v12, :cond_5b
  88
  89      iget-object v0, v12, Lcom/android/server/am/ReceiverList;->curBroadcast:Lcom/android/server/am/BroadcastRecord;
  90
  91 -    if-eqz v0, :cond_35
  92 +    if-eqz v0, :cond_3c
  93
  94      iget-object v11, v12, Lcom/android/server/am/ReceiverList;->curBroadcast:Lcom/android/server/am/BroadcastRecord;
  95
  96 @@ -59172,20 +59178,26 @@
  97
  98      move-result v7
  99
 100 -    if-eqz v7, :cond_35
 101 +    if-eqz v7, :cond_3c
 102
 103      const/4 v8, 0x1
 104
 105      iget-object v0, v11, Lcom/android/server/am/BroadcastRecord;->queue:Lcom/android/server/am/BroadcastQueue;
 106
 107 +    iget-object v1, p0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
 108 +
 109 +    invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->setContext(Landroid/content/Context;)V
 110 +
 111 +    iget-object v0, v11, Lcom/android/server/am/BroadcastRecord;->queue:Lcom/android/server/am/BroadcastQueue;
 112 +
 113      const/4 v1, 0x0
 114
 115      invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->processNextBroadcast(Z)V
 116
 117 -    :cond_35
 118 +    :cond_3c
 119      iget-object v0, v12, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
 120
 121 -    if-eqz v0, :cond_40
 122 +    if-eqz v0, :cond_47
 123
 124      iget-object v0, v12, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
 125
 126 @@ -59193,12 +59205,12 @@
 127
 128      invoke-virtual {v0, v12}, Ljava/util/HashSet;->remove(Ljava/lang/Object;)Z
 129
 130 -    :cond_40
 131 +    :cond_47
 132      invoke-virtual {p0, v12}, Lcom/android/server/am/ActivityManagerService;->removeReceiverLocked(Lcom/android/server/am/ReceiverList;)V
 133
 134      iget-boolean v0, v12, Lcom/android/server/am/ReceiverList;->linkedToDeath:Z
 135
 136 -    if-eqz v0, :cond_54
 137 +    if-eqz v0, :cond_5b
 138
 139      const/4 v0, 0x0
 140
 141 @@ -59214,37 +59226,37 @@
 142
 143      invoke-interface {v0, v12, v1}, Landroid/os/IBinder;->unlinkToDeath(Landroid/os/IBinder$DeathRecipient;I)Z
 144
 145 -    :cond_54
 146 +    :cond_5b
 147      monitor-exit p0
 148 -    :try_end_55
 149 -    .catchall {:try_start_6 .. :try_end_55} :catchall_5e
 150 +    :try_end_5c
 151 +    .catchall {:try_start_6 .. :try_end_5c} :catchall_65
 152
 153 -    if-eqz v8, :cond_5a
 154 +    if-eqz v8, :cond_61
 155
 156 -    :try_start_57
 157 +    :try_start_5e
 158      invoke-virtual {p0}, Lcom/android/server/am/ActivityManagerService;->trimApplications()V
 159 -    :try_end_5a
 160 -    .catchall {:try_start_57 .. :try_end_5a} :catchall_61
 161 +    :try_end_61
 162 +    .catchall {:try_start_5e .. :try_end_61} :catchall_68
 163
 164 -    :cond_5a
 165 +    :cond_61
 166      invoke-static {v9, v10}, Landroid/os/Binder;->restoreCallingIdentity(J)V
 167
 168      return-void
 169
 170 -    :catchall_5e
 171 +    :catchall_65
 172      move-exception v0
 173
 174 -    :try_start_5f
 175 +    :try_start_66
 176      monitor-exit p0
 177 -    :try_end_60
 178 -    .catchall {:try_start_5f .. :try_end_60} :catchall_5e
 179 +    :try_end_67
 180 +    .catchall {:try_start_66 .. :try_end_67} :catchall_65
 181
 182 -    :try_start_60
 183 +    :try_start_67
 184      throw v0
 185 -    :try_end_61
 186 -    .catchall {:try_start_60 .. :try_end_61} :catchall_61
 187 +    :try_end_68
 188 +    .catchall {:try_start_67 .. :try_end_68} :catchall_68
 189
 190 -    :catchall_61
 191 +    :catchall_68
 192      move-exception v0
 193
 194      invoke-static {v9, v10}, Landroid/os/Binder;->restoreCallingIdentity(J)V
 195 diff -Npru -x '*RIL*' pdroid-services/smali/com/android/server/am/BroadcastQueue.smali stock-services/smali/com/android/server/am/BroadcastQueue.smali
 196 --- pdroid-services/smali/com/android/server/am/BroadcastQueue.smali    2012-10-13 14:13:23.913761471 -0500
 197 +++ stock-services/smali/com/android/server/am/BroadcastQueue.smali     2012-10-13 14:13:01.777651703 -0500
 198 @@ -34,6 +34,8 @@
 199
 200  .field mBroadcastsScheduled:Z
 201
 202 +.field mContext:Landroid/content/Context;
 203 +
 204  .field final mHandler:Landroid/os/Handler;
 205
 206  .field final mOrderedBroadcasts:Ljava/util/ArrayList;
 207 @@ -73,7 +75,9 @@
 208
 209  # direct methods
 210  .method constructor <init>(Lcom/android/server/am/ActivityManagerService;Ljava/lang/String;J)V
 211 -    .registers 6
 212 +    .registers 7
 213 +
 214 +    const/4 v1, 0x0
 215
 216      invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 217
 218 @@ -99,9 +103,7 @@
 219
 220      iput-boolean v0, p0, Lcom/android/server/am/BroadcastQueue;->mBroadcastsScheduled:Z
 221
 222 -    const/4 v0, 0x0
 223 -
 224 -    iput-object v0, p0, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
 225 +    iput-object v1, p0, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
 226
 227      new-instance v0, Lcom/android/server/am/BroadcastQueue$1;
 228
 229 @@ -109,6 +111,8 @@
 230
 231      iput-object v0, p0, Lcom/android/server/am/BroadcastQueue;->mHandler:Landroid/os/Handler;
 232
 233 +    iput-object v1, p0, Lcom/android/server/am/BroadcastQueue;->mContext:Landroid/content/Context;
 234 +
 235      iput-object p1, p0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 236
 237      iput-object p2, p0, Lcom/android/server/am/BroadcastQueue;->mQueueName:Ljava/lang/String;
 238 @@ -559,6 +563,122 @@
 239      goto :goto_153
 240  .end method
 241
 242 +.method private enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
 243 +    .registers 10
 244 +
 245 +    iget-object v4, p0, Lcom/android/server/am/BroadcastQueue;->mContext:Landroid/content/Context;
 246 +
 247 +    if-eqz v4, :cond_40
 248 +
 249 +    if-eqz p2, :cond_40
 250 +
 251 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 252 +
 253 +    if-eqz v4, :cond_40
 254 +
 255 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 256 +
 257 +    invoke-virtual {v4}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 258 +
 259 +    move-result-object v4
 260 +
 261 +    if-eqz v4, :cond_40
 262 +
 263 +    const/4 v2, 0x0
 264 +
 265 +    const/4 v3, -0x1
 266 +
 267 +    :try_start_14
 268 +    instance-of v4, p1, Lcom/android/server/am/BroadcastFilter;
 269 +
 270 +    if-eqz v4, :cond_41
 271 +
 272 +    move-object v0, p1
 273 +
 274 +    check-cast v0, Lcom/android/server/am/BroadcastFilter;
 275 +
 276 +    move-object v4, v0
 277 +
 278 +    iget-object v4, v4, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
 279 +
 280 +    iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
 281 +
 282 +    iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
 283 +
 284 +    iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 285 +
 286 +    check-cast p1, Lcom/android/server/am/BroadcastFilter;
 287 +
 288 +    iget-object v4, p1, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
 289 +
 290 +    iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
 291 +
 292 +    iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
 293 +
 294 +    iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
 295 +    :try_end_2e
 296 +    .catch Ljava/lang/Exception; {:try_start_14 .. :try_end_2e} :catch_58
 297 +
 298 +    :cond_2e
 299 +    :goto_2e
 300 +    if-eqz v2, :cond_40
 301 +
 302 +    const/4 v4, -0x1
 303 +
 304 +    if-eq v3, v4, :cond_40
 305 +
 306 +    iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
 307 +
 308 +    iget-object v5, p0, Lcom/android/server/am/BroadcastQueue;->mContext:Landroid/content/Context;
 309 +
 310 +    iget-object v6, p2, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
 311 +
 312 +    invoke-interface {v6}, Ljava/util/List;->size()I
 313 +
 314 +    move-result v6
 315 +
 316 +    invoke-static {v2, v3, v4, v5, v6}, Landroid/privacy/surrogate/PrivacyActivityManagerService;->enforcePrivacyPermission(Ljava/lang/String;ILandroid/content/Intent;Landroid/content/Context;I)V
 317 +
 318 +    :cond_40
 319 +    :goto_40
 320 +    return-void
 321 +
 322 +    :cond_41
 323 +    :try_start_41
 324 +    instance-of v4, p1, Landroid/content/pm/ResolveInfo;
 325 +
 326 +    if-eqz v4, :cond_2e
 327 +
 328 +    move-object v0, p1
 329 +
 330 +    check-cast v0, Landroid/content/pm/ResolveInfo;
 331 +
 332 +    move-object v4, v0
 333 +
 334 +    iget-object v4, v4, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 335 +
 336 +    iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
 337 +
 338 +    iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 339 +
 340 +    check-cast p1, Landroid/content/pm/ResolveInfo;
 341 +
 342 +    iget-object v4, p1, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 343 +
 344 +    iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
 345 +
 346 +    iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
 347 +    :try_end_57
 348 +    .catch Ljava/lang/Exception; {:try_start_41 .. :try_end_57} :catch_58
 349 +
 350 +    goto :goto_2e
 351 +
 352 +    :catch_58
 353 +    move-exception v1
 354 +
 355 +    goto :goto_40
 356 +.end method
 357 +
 358  .method private static performReceiveLocked(Lcom/android/server/am/ProcessRecord;Landroid/content/IIntentReceiver;Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZ)V
 359      .registers 16
 360      .annotation system Ldalvik/annotation/Throws;
 361 @@ -2541,7 +2661,7 @@
 362      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
 363      :try_end_224
 364      .catchall {:try_start_1fd .. :try_end_224} :catchall_69
 365 -    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2b0
 366 +    .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2b9
 367
 368      :cond_224
 369      :goto_224
 370 @@ -2641,11 +2761,19 @@
 371
 372      move-result-object v22
 373
 374 +    move-object/from16 v0, p0
 375 +
 376 +    move-object/from16 v1, v22
 377 +
 378 +    move-object/from16 v2, v27
 379 +
 380 +    invoke-direct {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
 381 +
 382      move-object/from16 v0, v22
 383
 384      instance-of v3, v0, Lcom/android/server/am/BroadcastFilter;
 385
 386 -    if-eqz v3, :cond_2dd
 387 +    if-eqz v3, :cond_2e6
 388
 389      move-object/from16 v0, v22
 390
 391 @@ -2667,15 +2795,15 @@
 392
 393      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
 394
 395 -    if-eqz v3, :cond_2a5
 396 +    if-eqz v3, :cond_2ae
 397
 398      move-object/from16 v0, v27
 399
 400      iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
 401
 402 -    if-nez v3, :cond_2ad
 403 +    if-nez v3, :cond_2b6
 404
 405 -    :cond_2a5
 406 +    :cond_2ae
 407      const/4 v3, 0x0
 408
 409      move-object/from16 v0, v27
 410 @@ -2684,12 +2812,12 @@
 411
 412      invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
 413
 414 -    :cond_2ad
 415 +    :cond_2b6
 416      monitor-exit v34
 417
 418      goto/16 :goto_93
 419
 420 -    :catch_2b0
 421 +    :catch_2b9
 422      move-exception v14
 423
 424      const-string v3, "BroadcastQueue"
 425 @@ -2734,7 +2862,7 @@
 426
 427      goto/16 :goto_224
 428
 429 -    :cond_2dd
 430 +    :cond_2e6
 431      move-object/from16 v0, v22
 432
 433      check-cast v0, Landroid/content/pm/ResolveInfo;
 434 @@ -2779,7 +2907,7 @@
 435
 436      move-result v26
 437
 438 -    if-eqz v26, :cond_397
 439 +    if-eqz v26, :cond_3a0
 440
 441      move-object/from16 v0, v18
 442
 443 @@ -2787,7 +2915,7 @@
 444
 445      iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
 446
 447 -    if-nez v3, :cond_446
 448 +    if-nez v3, :cond_44f
 449
 450      const-string v3, "BroadcastQueue"
 451
 452 @@ -2917,10 +3045,10 @@
 453
 454      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 455
 456 -    :goto_395
 457 +    :goto_39e
 458      const/16 v29, 0x1
 459
 460 -    :cond_397
 461 +    :cond_3a0
 462      move-object/from16 v0, v18
 463
 464      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 465 @@ -2931,17 +3059,17 @@
 466
 467      const/16 v5, 0x3e8
 468
 469 -    if-eq v3, v5, :cond_41f
 470 +    if-eq v3, v5, :cond_428
 471
 472      move-object/from16 v0, v27
 473
 474      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
 475 -    :try_end_3a7
 476 -    .catchall {:try_start_224 .. :try_end_3a7} :catchall_69
 477 +    :try_end_3b0
 478 +    .catchall {:try_start_224 .. :try_end_3b0} :catchall_69
 479
 480 -    if-eqz v3, :cond_41f
 481 +    if-eqz v3, :cond_428
 482
 483 -    :try_start_3a9
 484 +    :try_start_3b2
 485      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 486
 487      move-result-object v3
 488 @@ -2959,16 +3087,16 @@
 489      iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
 490
 491      invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
 492 -    :try_end_3bc
 493 -    .catchall {:try_start_3a9 .. :try_end_3bc} :catchall_69
 494 -    .catch Landroid/os/RemoteException; {:try_start_3a9 .. :try_end_3bc} :catch_4c8
 495 +    :try_end_3c5
 496 +    .catchall {:try_start_3b2 .. :try_end_3c5} :catchall_69
 497 +    .catch Landroid/os/RemoteException; {:try_start_3b2 .. :try_end_3c5} :catch_4d1
 498
 499      move-result v26
 500
 501 -    :goto_3bd
 502 -    if-eqz v26, :cond_41f
 503 +    :goto_3c6
 504 +    if-eqz v26, :cond_428
 505
 506 -    :try_start_3bf
 507 +    :try_start_3c8
 508      const-string v3, "BroadcastQueue"
 509
 510      new-instance v5, Ljava/lang/StringBuilder;
 511 @@ -3063,12 +3191,12 @@
 512
 513      const/16 v29, 0x1
 514
 515 -    :cond_41f
 516 +    :cond_428
 517      move-object/from16 v0, v27
 518
 519      iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
 520
 521 -    if-eqz v3, :cond_42f
 522 +    if-eqz v3, :cond_438
 523
 524      move-object/from16 v0, v27
 525
 526 @@ -3076,12 +3204,12 @@
 527
 528      iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
 529
 530 -    if-eqz v3, :cond_42f
 531 +    if-eqz v3, :cond_438
 532
 533      const/16 v29, 0x1
 534
 535 -    :cond_42f
 536 -    if-eqz v29, :cond_4cd
 537 +    :cond_438
 538 +    if-eqz v29, :cond_4d6
 539
 540      const/4 v3, 0x0
 541
 542 @@ -3107,7 +3235,7 @@
 543
 544      goto/16 :goto_93
 545
 546 -    :cond_446
 547 +    :cond_44f
 548      const-string v3, "BroadcastQueue"
 549
 550      new-instance v5, Ljava/lang/StringBuilder;
 551 @@ -3234,16 +3362,16 @@
 552
 553      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 554
 555 -    goto/16 :goto_395
 556 +    goto/16 :goto_39e
 557
 558 -    :catch_4c8
 559 +    :catch_4d1
 560      move-exception v14
 561
 562      const/16 v26, -0x1
 563
 564 -    goto/16 :goto_3bd
 565 +    goto/16 :goto_3c6
 566
 567 -    :cond_4cd
 568 +    :cond_4d6
 569      const/4 v3, 0x1
 570
 571      move-object/from16 v0, v27
 572 @@ -3284,7 +3412,7 @@
 573
 574      const/16 v5, 0x3e8
 575
 576 -    if-eq v3, v5, :cond_521
 577 +    if-eq v3, v5, :cond_52a
 578
 579      move-object/from16 v0, p0
 580
 581 @@ -3306,11 +3434,11 @@
 582
 583      move-result v20
 584
 585 -    if-eqz v20, :cond_56a
 586 +    if-eqz v20, :cond_573
 587
 588      const/16 v31, 0x0
 589
 590 -    :goto_50f
 591 +    :goto_518
 592      move-object/from16 v0, p0
 593
 594      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 595 @@ -3329,7 +3457,7 @@
 596
 597      iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 598
 599 -    :cond_521
 600 +    :cond_52a
 601      move-object/from16 v0, v18
 602
 603      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 604 @@ -3337,10 +3465,10 @@
 605      move-object/from16 v0, v27
 606
 607      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
 608 -    :try_end_529
 609 -    .catchall {:try_start_3bf .. :try_end_529} :catchall_69
 610 +    :try_end_532
 611 +    .catchall {:try_start_3c8 .. :try_end_532} :catchall_69
 612
 613 -    :try_start_529
 614 +    :try_start_532
 615      invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
 616
 617      move-result-object v3
 618 @@ -3364,13 +3492,13 @@
 619      move-result v7
 620
 621      invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
 622 -    :try_end_541
 623 -    .catchall {:try_start_529 .. :try_end_541} :catchall_69
 624 -    .catch Landroid/os/RemoteException; {:try_start_529 .. :try_end_541} :catch_671
 625 -    .catch Ljava/lang/IllegalArgumentException; {:try_start_529 .. :try_end_541} :catch_573
 626 +    :try_end_54a
 627 +    .catchall {:try_start_532 .. :try_end_54a} :catchall_69
 628 +    .catch Landroid/os/RemoteException; {:try_start_532 .. :try_end_54a} :catch_67a
 629 +    .catch Ljava/lang/IllegalArgumentException; {:try_start_532 .. :try_end_54a} :catch_57c
 630
 631 -    :goto_541
 632 -    :try_start_541
 633 +    :goto_54a
 634 +    :try_start_54a
 635      move-object/from16 v0, p0
 636
 637      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 638 @@ -3387,15 +3515,15 @@
 639
 640      move-result-object v13
 641
 642 -    if-eqz v13, :cond_5bc
 643 +    if-eqz v13, :cond_5c5
 644
 645      iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
 646 -    :try_end_555
 647 -    .catchall {:try_start_541 .. :try_end_555} :catchall_69
 648 +    :try_end_55e
 649 +    .catchall {:try_start_54a .. :try_end_55e} :catchall_69
 650
 651 -    if-eqz v3, :cond_5bc
 652 +    if-eqz v3, :cond_5c5
 653
 654 -    :try_start_557
 655 +    :try_start_560
 656      move-object/from16 v0, v18
 657
 658      iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
 659 @@ -3409,16 +3537,16 @@
 660      move-object/from16 v1, v27
 661
 662      invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
 663 -    :try_end_567
 664 -    .catchall {:try_start_557 .. :try_end_567} :catchall_69
 665 -    .catch Landroid/os/RemoteException; {:try_start_557 .. :try_end_567} :catch_59f
 666 +    :try_end_570
 667 +    .catchall {:try_start_560 .. :try_end_570} :catchall_69
 668 +    .catch Landroid/os/RemoteException; {:try_start_560 .. :try_end_570} :catch_5a8
 669
 670 -    :try_start_567
 671 +    :try_start_570
 672      monitor-exit v34
 673
 674      goto/16 :goto_93
 675
 676 -    :cond_56a
 677 +    :cond_573
 678      move-object/from16 v0, v27
 679
 680      iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
 681 @@ -3427,9 +3555,9 @@
 682
 683      move-result v31
 684
 685 -    goto :goto_50f
 686 +    goto :goto_518
 687
 688 -    :catch_573
 689 +    :catch_57c
 690      move-exception v14
 691
 692      const-string v3, "BroadcastQueue"
 693 @@ -3472,9 +3600,9 @@
 694
 695      invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
 696
 697 -    goto :goto_541
 698 +    goto :goto_54a
 699
 700 -    :catch_59f
 701 +    :catch_5a8
 702      move-exception v14
 703
 704      const-string v3, "BroadcastQueue"
 705 @@ -3503,7 +3631,7 @@
 706
 707      invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 708
 709 -    :cond_5bc
 710 +    :cond_5c5
 711      move-object/from16 v0, p0
 712
 713      iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
 714 @@ -3544,11 +3672,11 @@
 715
 716      and-int/2addr v10, v11
 717
 718 -    if-eqz v10, :cond_660
 719 +    if-eqz v10, :cond_669
 720
 721      const/4 v10, 0x1
 722
 723 -    :goto_5e5
 724 +    :goto_5ee
 725      const/4 v11, 0x0
 726
 727      invoke-virtual/range {v3 .. v11}, Lcom/android/server/am/ActivityManagerService;->startProcessLocked(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;ZILjava/lang/String;Landroid/content/ComponentName;ZZ)Lcom/android/server/am/ProcessRecord;
 728 @@ -3559,7 +3687,7 @@
 729
 730      iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
 731
 732 -    if-nez v3, :cond_662
 733 +    if-nez v3, :cond_66b
 734
 735      const-string v3, "BroadcastQueue"
 736
 737 @@ -3671,12 +3799,12 @@
 738
 739      goto/16 :goto_93
 740
 741 -    :cond_660
 742 +    :cond_669
 743      const/4 v10, 0x0
 744
 745 -    goto :goto_5e5
 746 +    goto :goto_5ee
 747
 748 -    :cond_662
 749 +    :cond_66b
 750      move-object/from16 v0, v27
 751
 752      move-object/from16 v1, p0
 753 @@ -3690,15 +3818,15 @@
 754      iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
 755
 756      monitor-exit v34
 757 -    :try_end_66f
 758 -    .catchall {:try_start_567 .. :try_end_66f} :catchall_69
 759 +    :try_end_678
 760 +    .catchall {:try_start_570 .. :try_end_678} :catchall_69
 761
 762      goto/16 :goto_93
 763
 764 -    :catch_671
 765 +    :catch_67a
 766      move-exception v3
 767
 768 -    goto/16 :goto_541
 769 +    goto/16 :goto_54a
 770  .end method
 771
 772  .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
 773 @@ -3957,6 +4085,14 @@
 774      return-void
 775  .end method
 776
 777 +.method public setContext(Landroid/content/Context;)V
 778 +    .registers 2
 779 +
 780 +    iput-object p1, p0, Lcom/android/server/am/BroadcastQueue;->mContext:Landroid/content/Context;
 781 +
 782 +    return-void
 783 +.end method
 784 +
 785  .method public skipCurrentReceiverLocked(Lcom/android/server/am/ProcessRecord;)V
 786      .registers 10
 787
 788 diff -Npru -x '*RIL*' pdroid-services/smali/com/android/server/ServerThread.smali stock-services/smali/com/android/server/ServerThread.smali
 789 --- pdroid-services/smali/com/android/server/ServerThread.smali 2012-10-13 14:13:22.213753040 -0500
 790 +++ stock-services/smali/com/android/server/ServerThread.smali  2012-10-13 14:13:01.069648198 -0500
 791 @@ -32,6 +32,41 @@
 792      return-void
 793  .end method
 794
 795 +.method private addPrivacyService(Landroid/content/Context;)V
 796 +    .registers 5
 797 +
 798 +    :try_start_0
 799 +    const-string v1, "SystemServer"
 800 +
 801 +    const-string v2, "Privacy Service"
 802 +
 803 +    invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 804 +
 805 +    const-string v1, "privacy"
 806 +
 807 +    new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
 808 +
 809 +    invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
 810 +
 811 +    invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 812 +    :try_end_11
 813 +    .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
 814 +
 815 +    :goto_11
 816 +    return-void
 817 +
 818 +    :catch_12
 819 +    move-exception v0
 820 +
 821 +    const-string v1, "SystemServer"
 822 +
 823 +    const-string v2, "Failure starting Privacy Service"
 824 +
 825 +    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 826 +
 827 +    goto :goto_11
 828 +.end method
 829 +
 830  .method static final startSystemUi(Landroid/content/Context;)V
 831      .registers 5
 832
 833 @@ -163,7 +198,7 @@
 834
 835      const/16 v9, 0x31
 836
 837 -    if-ne v3, v9, :cond_71d
 838 +    if-ne v3, v9, :cond_722
 839
 840      const/16 v98, 0x1
 841
 842 @@ -174,7 +209,7 @@
 843
 844      const/4 v9, 0x1
 845
 846 -    if-le v3, v9, :cond_721
 847 +    if-le v3, v9, :cond_726
 848
 849      const/4 v3, 0x1
 850
 851 @@ -210,7 +245,7 @@
 852
 853      move-result v3
 854
 855 -    if-eqz v3, :cond_725
 856 +    if-eqz v3, :cond_72a
 857
 858      const/16 v69, 0x0
 859
 860 @@ -312,7 +347,7 @@
 861
 862      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
 863      :try_end_c2
 864 -    .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_abf
 865 +    .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_ac4
 866
 867      :try_start_c2
 868      const-string v3, "power"
 869 @@ -381,7 +416,7 @@
 870
 871      move-result v3
 872
 873 -    if-eqz v3, :cond_72b
 874 +    if-eqz v3, :cond_730
 875
 876      const-string v3, "SystemServer"
 877
 878 @@ -393,7 +428,7 @@
 879
 880      :cond_119
 881      :goto_119
 882 -    if-eqz v69, :cond_740
 883 +    if-eqz v69, :cond_745
 884
 885      const/4 v3, 0x1
 886
 887 @@ -402,7 +437,7 @@
 888
 889      invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
 890      :try_end_121
 891 -    .catch Ljava/lang/RuntimeException; {:try_start_c2 .. :try_end_121} :catch_74f
 892 +    .catch Ljava/lang/RuntimeException; {:try_start_c2 .. :try_end_121} :catch_754
 893
 894      move-result-object v93
 895
 896 @@ -411,8 +446,8 @@
 897      :try_start_124
 898      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
 899      :try_end_127
 900 -    .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a4e
 901 -    .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_74f
 902 +    .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a53
 903 +    .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_754
 904
 905      move-result v72
 906
 907 @@ -428,7 +463,7 @@
 908
 909      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
 910      :try_end_133
 911 -    .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_74f
 912 +    .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_754
 913
 914      :try_start_133
 915      const-string v3, "SystemServer"
 916 @@ -443,8 +478,8 @@
 917
 918      invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
 919      :try_end_141
 920 -    .catch Ljava/lang/Throwable; {:try_start_133 .. :try_end_141} :catch_743
 921 -    .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_74f
 922 +    .catch Ljava/lang/Throwable; {:try_start_133 .. :try_end_141} :catch_748
 923 +    .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_754
 924
 925      :try_start_141
 926      const-string v3, "account"
 927 @@ -453,8 +488,8 @@
 928
 929      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 930      :try_end_148
 931 -    .catch Ljava/lang/Throwable; {:try_start_141 .. :try_end_148} :catch_afe
 932 -    .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_ac8
 933 +    .catch Ljava/lang/Throwable; {:try_start_141 .. :try_end_148} :catch_b03
 934 +    .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_acd
 935
 936      move-object/from16 v42, v43
 937
 938 @@ -470,7 +505,7 @@
 939
 940      move/from16 v0, v69
 941
 942 -    if-ne v0, v3, :cond_766
 943 +    if-ne v0, v3, :cond_76b
 944
 945      const/4 v3, 0x1
 946
 947 @@ -479,6 +514,10 @@
 948
 949      move-result-object v58
 950
 951 +    move-object/from16 v0, p0
 952 +
 953 +    invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
 954 +
 955      const-string v3, "SystemServer"
 956
 957      const-string v9, "System Content Providers"
 958 @@ -498,10 +537,10 @@
 959      move-object/from16 v0, v78
 960
 961      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
 962 -    :try_end_173
 963 -    .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_173} :catch_74f
 964 +    :try_end_178
 965 +    .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_178} :catch_754
 966
 967 -    :try_start_173
 968 +    :try_start_178
 969      const-string v3, "SystemServer"
 970
 971      const-string v9, "Battery Service"
 972 @@ -513,10 +552,10 @@
 973      move-object/from16 v0, v78
 974
 975      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
 976 -    :try_end_181
 977 -    .catch Ljava/lang/RuntimeException; {:try_start_173 .. :try_end_181} :catch_ad1
 978 +    :try_end_186
 979 +    .catch Ljava/lang/RuntimeException; {:try_start_178 .. :try_end_186} :catch_ad6
 980
 981 -    :try_start_181
 982 +    :try_start_186
 983      const-string v3, "battery"
 984
 985      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 986 @@ -532,10 +571,10 @@
 987      move-object/from16 v0, v118
 988
 989      invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
 990 -    :try_end_194
 991 -    .catch Ljava/lang/RuntimeException; {:try_start_181 .. :try_end_194} :catch_ada
 992 +    :try_end_199
 993 +    .catch Ljava/lang/RuntimeException; {:try_start_186 .. :try_end_199} :catch_adf
 994
 995 -    :try_start_194
 996 +    :try_start_199
 997      const-string v3, "vibrator"
 998
 999      move-object/from16 v0, v118
1000 @@ -559,10 +598,10 @@
1001      new-instance v7, Lcom/android/server/AlarmManagerService;
1002
1003      invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
1004 -    :try_end_1b0
1005 -    .catch Ljava/lang/RuntimeException; {:try_start_194 .. :try_end_1b0} :catch_ae1
1006 +    :try_end_1b5
1007 +    .catch Ljava/lang/RuntimeException; {:try_start_199 .. :try_end_1b5} :catch_ae6
1008
1009 -    :try_start_1b0
1010 +    :try_start_1b5
1011      const-string v3, "alarm"
1012
1013      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1014 @@ -593,18 +632,18 @@
1015
1016      move/from16 v0, v69
1017
1018 -    if-eq v0, v3, :cond_769
1019 +    if-eq v0, v3, :cond_76e
1020
1021      const/4 v3, 0x1
1022
1023      move v9, v3
1024
1025 -    :goto_1d5
1026 -    if-nez v72, :cond_76d
1027 +    :goto_1da
1028 +    if-nez v72, :cond_772
1029
1030      const/4 v3, 0x1
1031
1032 -    :goto_1d8
1033 +    :goto_1dd
1034      move/from16 v0, v92
1035
1036      invoke-static {v4, v6, v9, v3, v0}, Lcom/android/server/wm/WindowManagerService;->main(Landroid/content/Context;Lcom/android/server/PowerManagerService;ZZZ)Lcom/android/server/wm/WindowManagerService;
1037 @@ -647,22 +686,22 @@
1038
1039      move-result v3
1040
1041 -    if-eqz v3, :cond_770
1042 +    if-eqz v3, :cond_775
1043
1044      const-string v3, "SystemServer"
1045
1046      const-string v9, "No Bluetooh Service (emulator)"
1047
1048      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1049 -    :try_end_20e
1050 -    .catch Ljava/lang/RuntimeException; {:try_start_1b0 .. :try_end_20e} :catch_77e
1051 +    :try_end_213
1052 +    .catch Ljava/lang/RuntimeException; {:try_start_1b5 .. :try_end_213} :catch_783
1053
1054 -    :goto_20e
1055 +    :goto_213
1056      move-object/from16 v117, v118
1057
1058      move-object/from16 v77, v78
1059
1060 -    :goto_212
1061 +    :goto_217
1062      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
1063
1064      move-result-object v3
1065 @@ -701,9 +740,9 @@
1066
1067      move/from16 v0, v69
1068
1069 -    if-eq v0, v3, :cond_264
1070 +    if-eq v0, v3, :cond_269
1071
1072 -    :try_start_23a
1073 +    :try_start_23f
1074      const-string v3, "SystemServer"
1075
1076      const-string v9, "Input Method Service"
1077 @@ -717,22 +756,22 @@
1078      move-object/from16 v1, v126
1079
1080      invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
1081 -    :try_end_24a
1082 -    .catch Ljava/lang/Throwable; {:try_start_23a .. :try_end_24a} :catch_7d3
1083 +    :try_end_24f
1084 +    .catch Ljava/lang/Throwable; {:try_start_23f .. :try_end_24f} :catch_7d8
1085
1086 -    :try_start_24a
1087 +    :try_start_24f
1088      const-string v3, "input_method"
1089
1090      move-object/from16 v0, v75
1091
1092      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1093 -    :try_end_251
1094 -    .catch Ljava/lang/Throwable; {:try_start_24a .. :try_end_251} :catch_aba
1095 +    :try_end_256
1096 +    .catch Ljava/lang/Throwable; {:try_start_24f .. :try_end_256} :catch_abf
1097
1098      move-object/from16 v74, v75
1099
1100 -    :goto_253
1101 -    :try_start_253
1102 +    :goto_258
1103 +    :try_start_258
1104      const-string v3, "SystemServer"
1105
1106      const-string v9, "Accessibility Manager"
1107 @@ -746,24 +785,24 @@
1108      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
1109
1110      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1111 -    :try_end_264
1112 -    .catch Ljava/lang/Throwable; {:try_start_253 .. :try_end_264} :catch_7df
1113 +    :try_end_269
1114 +    .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_269} :catch_7e4
1115
1116 -    :cond_264
1117 -    :goto_264
1118 -    :try_start_264
1119 +    :cond_269
1120 +    :goto_269
1121 +    :try_start_269
1122      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
1123 -    :try_end_267
1124 -    .catch Ljava/lang/Throwable; {:try_start_264 .. :try_end_267} :catch_7eb
1125 +    :try_end_26c
1126 +    .catch Ljava/lang/Throwable; {:try_start_269 .. :try_end_26c} :catch_7f0
1127
1128 -    :goto_267
1129 -    :try_start_267
1130 +    :goto_26c
1131 +    :try_start_26c
1132      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
1133 -    :try_end_26a
1134 -    .catch Ljava/lang/Throwable; {:try_start_267 .. :try_end_26a} :catch_7f7
1135 +    :try_end_26f
1136 +    .catch Ljava/lang/Throwable; {:try_start_26c .. :try_end_26f} :catch_7fc
1137
1138 -    :goto_26a
1139 -    :try_start_26a
1140 +    :goto_26f
1141 +    :try_start_26f
1142      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
1143
1144      move-result-object v3
1145 @@ -781,15 +820,15 @@
1146      const/4 v10, 0x0
1147
1148      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
1149 -    :try_end_27d
1150 -    .catch Landroid/os/RemoteException; {:try_start_26a .. :try_end_27d} :catch_ab7
1151 +    :try_end_282
1152 +    .catch Landroid/os/RemoteException; {:try_start_26f .. :try_end_282} :catch_abc
1153
1154 -    :goto_27d
1155 +    :goto_282
1156      const/4 v3, 0x1
1157
1158      move/from16 v0, v69
1159
1160 -    if-eq v0, v3, :cond_b03
1161 +    if-eq v0, v3, :cond_b08
1162
1163      const/16 v84, 0x0
1164
1165 @@ -805,9 +844,9 @@
1166
1167      move-result v3
1168
1169 -    if-nez v3, :cond_2a9
1170 +    if-nez v3, :cond_2ae
1171
1172 -    :try_start_292
1173 +    :try_start_297
1174      const-string v3, "SystemServer"
1175
1176      const-string v9, "Mount Service"
1177 @@ -819,23 +858,23 @@
1178      move-object/from16 v0, v85
1179
1180      invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
1181 -    :try_end_2a0
1182 -    .catch Ljava/lang/Throwable; {:try_start_292 .. :try_end_2a0} :catch_803
1183 +    :try_end_2a5
1184 +    .catch Ljava/lang/Throwable; {:try_start_297 .. :try_end_2a5} :catch_808
1185
1186 -    :try_start_2a0
1187 +    :try_start_2a5
1188      const-string v3, "mount"
1189
1190      move-object/from16 v0, v85
1191
1192      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1193 -    :try_end_2a7
1194 -    .catch Ljava/lang/Throwable; {:try_start_2a0 .. :try_end_2a7} :catch_ab2
1195 +    :try_end_2ac
1196 +    .catch Ljava/lang/Throwable; {:try_start_2a5 .. :try_end_2ac} :catch_ab7
1197
1198      move-object/from16 v84, v85
1199
1200 -    :cond_2a9
1201 -    :goto_2a9
1202 -    :try_start_2a9
1203 +    :cond_2ae
1204 +    :goto_2ae
1205 +    :try_start_2ae
1206      const-string v3, "SystemServer"
1207
1208      const-string v9, "LockSettingsService"
1209 @@ -847,22 +886,22 @@
1210      move-object/from16 v0, v82
1211
1212      invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
1213 -    :try_end_2b7
1214 -    .catch Ljava/lang/Throwable; {:try_start_2a9 .. :try_end_2b7} :catch_80f
1215 +    :try_end_2bc
1216 +    .catch Ljava/lang/Throwable; {:try_start_2ae .. :try_end_2bc} :catch_814
1217
1218 -    :try_start_2b7
1219 +    :try_start_2bc
1220      const-string v3, "lock_settings"
1221
1222      move-object/from16 v0, v82
1223
1224      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1225 -    :try_end_2be
1226 -    .catch Ljava/lang/Throwable; {:try_start_2b7 .. :try_end_2be} :catch_aad
1227 +    :try_end_2c3
1228 +    .catch Ljava/lang/Throwable; {:try_start_2bc .. :try_end_2c3} :catch_ab2
1229
1230      move-object/from16 v81, v82
1231
1232 -    :goto_2c0
1233 -    :try_start_2c0
1234 +    :goto_2c5
1235 +    :try_start_2c5
1236      const-string v3, "SystemServer"
1237
1238      const-string v9, "Device Policy"
1239 @@ -874,22 +913,22 @@
1240      move-object/from16 v0, v63
1241
1242      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
1243 -    :try_end_2ce
1244 -    .catch Ljava/lang/Throwable; {:try_start_2c0 .. :try_end_2ce} :catch_81b
1245 +    :try_end_2d3
1246 +    .catch Ljava/lang/Throwable; {:try_start_2c5 .. :try_end_2d3} :catch_820
1247
1248 -    :try_start_2ce
1249 +    :try_start_2d3
1250      const-string v3, "device_policy"
1251
1252      move-object/from16 v0, v63
1253
1254      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1255 -    :try_end_2d5
1256 -    .catch Ljava/lang/Throwable; {:try_start_2ce .. :try_end_2d5} :catch_aa8
1257 +    :try_end_2da
1258 +    .catch Ljava/lang/Throwable; {:try_start_2d3 .. :try_end_2da} :catch_aad
1259
1260      move-object/from16 v62, v63
1261
1262 -    :goto_2d7
1263 -    :try_start_2d7
1264 +    :goto_2dc
1265 +    :try_start_2dc
1266      const-string v3, "SystemServer"
1267
1268      const-string v9, "Status Bar"
1269 @@ -903,22 +942,22 @@
1270      move-object/from16 v1, v126
1271
1272      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
1273 -    :try_end_2e7
1274 -    .catch Ljava/lang/Throwable; {:try_start_2d7 .. :try_end_2e7} :catch_827
1275 +    :try_end_2ec
1276 +    .catch Ljava/lang/Throwable; {:try_start_2dc .. :try_end_2ec} :catch_82c
1277
1278 -    :try_start_2e7
1279 +    :try_start_2ec
1280      const-string v3, "statusbar"
1281
1282      move-object/from16 v0, v108
1283
1284      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1285 -    :try_end_2ee
1286 -    .catch Ljava/lang/Throwable; {:try_start_2e7 .. :try_end_2ee} :catch_aa3
1287 +    :try_end_2f3
1288 +    .catch Ljava/lang/Throwable; {:try_start_2ec .. :try_end_2f3} :catch_aa8
1289
1290      move-object/from16 v107, v108
1291
1292 -    :goto_2f0
1293 -    :try_start_2f0
1294 +    :goto_2f5
1295 +    :try_start_2f5
1296      const-string v3, "SystemServer"
1297
1298      const-string v9, "Clipboard Service"
1299 @@ -932,11 +971,11 @@
1300      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
1301
1302      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1303 -    :try_end_301
1304 -    .catch Ljava/lang/Throwable; {:try_start_2f0 .. :try_end_301} :catch_833
1305 +    :try_end_306
1306 +    .catch Ljava/lang/Throwable; {:try_start_2f5 .. :try_end_306} :catch_838
1307
1308 -    :goto_301
1309 -    :try_start_301
1310 +    :goto_306
1311 +    :try_start_306
1312      const-string v3, "SystemServer"
1313
1314      const-string v9, "NetworkManagement Service"
1315 @@ -950,11 +989,11 @@
1316      const-string v3, "network_management"
1317
1318      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1319 -    :try_end_311
1320 -    .catch Ljava/lang/Throwable; {:try_start_301 .. :try_end_311} :catch_83f
1321 +    :try_end_316
1322 +    .catch Ljava/lang/Throwable; {:try_start_306 .. :try_end_316} :catch_844
1323
1324 -    :goto_311
1325 -    :try_start_311
1326 +    :goto_316
1327 +    :try_start_316
1328      const-string v3, "SystemServer"
1329
1330      const-string v9, "Text Service Manager Service"
1331 @@ -966,22 +1005,22 @@
1332      move-object/from16 v0, v112
1333
1334      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
1335 -    :try_end_31f
1336 -    .catch Ljava/lang/Throwable; {:try_start_311 .. :try_end_31f} :catch_84b
1337 +    :try_end_324
1338 +    .catch Ljava/lang/Throwable; {:try_start_316 .. :try_end_324} :catch_850
1339
1340 -    :try_start_31f
1341 +    :try_start_324
1342      const-string v3, "textservices"
1343
1344      move-object/from16 v0, v112
1345
1346      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1347 -    :try_end_326
1348 -    .catch Ljava/lang/Throwable; {:try_start_31f .. :try_end_326} :catch_a9e
1349 +    :try_end_32b
1350 +    .catch Ljava/lang/Throwable; {:try_start_324 .. :try_end_32b} :catch_aa3
1351
1352      move-object/from16 v111, v112
1353
1354 -    :goto_328
1355 -    :try_start_328
1356 +    :goto_32d
1357 +    :try_start_32d
1358      const-string v3, "SystemServer"
1359
1360      const-string v9, "NetworkStats Service"
1361 @@ -993,22 +1032,22 @@
1362      move-object/from16 v0, v87
1363
1364      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
1365 -    :try_end_336
1366 -    .catch Ljava/lang/Throwable; {:try_start_328 .. :try_end_336} :catch_857
1367 +    :try_end_33b
1368 +    .catch Ljava/lang/Throwable; {:try_start_32d .. :try_end_33b} :catch_85c
1369
1370 -    :try_start_336
1371 +    :try_start_33b
1372      const-string v3, "netstats"
1373
1374      move-object/from16 v0, v87
1375
1376      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1377 -    :try_end_33d
1378 -    .catch Ljava/lang/Throwable; {:try_start_336 .. :try_end_33d} :catch_a99
1379 +    :try_end_342
1380 +    .catch Ljava/lang/Throwable; {:try_start_33b .. :try_end_342} :catch_a9e
1381
1382      move-object/from16 v12, v87
1383
1384 -    :goto_33f
1385 -    :try_start_33f
1386 +    :goto_344
1387 +    :try_start_344
1388      const-string v3, "SystemServer"
1389
1390      const-string v9, "NetworkPolicy Service"
1391 @@ -1026,18 +1065,18 @@
1392      move-object v11, v6
1393
1394      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
1395 -    :try_end_351
1396 -    .catch Ljava/lang/Throwable; {:try_start_33f .. :try_end_351} :catch_863
1397 +    :try_end_356
1398 +    .catch Ljava/lang/Throwable; {:try_start_344 .. :try_end_356} :catch_868
1399
1400 -    :try_start_351
1401 +    :try_start_356
1402      const-string v3, "netpolicy"
1403
1404      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1405 -    :try_end_356
1406 -    .catch Ljava/lang/Throwable; {:try_start_351 .. :try_end_356} :catch_a96
1407 +    :try_end_35b
1408 +    .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_35b} :catch_a9b
1409
1410 -    :goto_356
1411 -    :try_start_356
1412 +    :goto_35b
1413 +    :try_start_35b
1414      const-string v3, "SystemServer"
1415
1416      const-string v9, "Wi-Fi P2pService"
1417 @@ -1049,22 +1088,22 @@
1418      move-object/from16 v0, v125
1419
1420      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
1421 -    :try_end_364
1422 -    .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_364} :catch_871
1423 +    :try_end_369
1424 +    .catch Ljava/lang/Throwable; {:try_start_35b .. :try_end_369} :catch_876
1425
1426 -    :try_start_364
1427 +    :try_start_369
1428      const-string v3, "wifip2p"
1429
1430      move-object/from16 v0, v125
1431
1432      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1433 -    :try_end_36b
1434 -    .catch Ljava/lang/Throwable; {:try_start_364 .. :try_end_36b} :catch_a91
1435 +    :try_end_370
1436 +    .catch Ljava/lang/Throwable; {:try_start_369 .. :try_end_370} :catch_a96
1437
1438      move-object/from16 v124, v125
1439
1440 -    :goto_36d
1441 -    :try_start_36d
1442 +    :goto_372
1443 +    :try_start_372
1444      const-string v3, "SystemServer"
1445
1446      const-string v9, "Wi-Fi Service"
1447 @@ -1076,22 +1115,22 @@
1448      move-object/from16 v0, v123
1449
1450      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
1451 -    :try_end_37b
1452 -    .catch Ljava/lang/Throwable; {:try_start_36d .. :try_end_37b} :catch_87d
1453 +    :try_end_380
1454 +    .catch Ljava/lang/Throwable; {:try_start_372 .. :try_end_380} :catch_882
1455
1456 -    :try_start_37b
1457 +    :try_start_380
1458      const-string v3, "wifi"
1459
1460      move-object/from16 v0, v123
1461
1462      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1463 -    :try_end_382
1464 -    .catch Ljava/lang/Throwable; {:try_start_37b .. :try_end_382} :catch_a8c
1465 +    :try_end_387
1466 +    .catch Ljava/lang/Throwable; {:try_start_380 .. :try_end_387} :catch_a91
1467
1468      move-object/from16 v122, v123
1469
1470 -    :goto_384
1471 -    :try_start_384
1472 +    :goto_389
1473 +    :try_start_389
1474      const-string v3, "SystemServer"
1475
1476      const-string v9, "Connectivity Service"
1477 @@ -1103,10 +1142,10 @@
1478      move-object/from16 v0, v57
1479
1480      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
1481 -    :try_end_392
1482 -    .catch Ljava/lang/Throwable; {:try_start_384 .. :try_end_392} :catch_889
1483 +    :try_end_397
1484 +    .catch Ljava/lang/Throwable; {:try_start_389 .. :try_end_397} :catch_88e
1485
1486 -    :try_start_392
1487 +    :try_start_397
1488      const-string v3, "connectivity"
1489
1490      move-object/from16 v0, v57
1491 @@ -1124,13 +1163,13 @@
1492      invoke-virtual/range {v122 .. v122}, Lcom/android/server/WifiService;->checkAndStartWifi()V
1493
1494      invoke-virtual/range {v124 .. v124}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
1495 -    :try_end_3a9
1496 -    .catch Ljava/lang/Throwable; {:try_start_392 .. :try_end_3a9} :catch_a87
1497 +    :try_end_3ae
1498 +    .catch Ljava/lang/Throwable; {:try_start_397 .. :try_end_3ae} :catch_a8c
1499
1500      move-object/from16 v56, v57
1501
1502 -    :goto_3ab
1503 -    :try_start_3ab
1504 +    :goto_3b0
1505 +    :try_start_3b0
1506      const-string v3, "SystemServer"
1507
1508      const-string v9, "Network Service Discovery Service"
1509 @@ -1146,11 +1185,11 @@
1510      move-object/from16 v0, v105
1511
1512      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1513 -    :try_end_3bd
1514 -    .catch Ljava/lang/Throwable; {:try_start_3ab .. :try_end_3bd} :catch_895
1515 +    :try_end_3c2
1516 +    .catch Ljava/lang/Throwable; {:try_start_3b0 .. :try_end_3c2} :catch_89a
1517
1518 -    :goto_3bd
1519 -    :try_start_3bd
1520 +    :goto_3c2
1521 +    :try_start_3c2
1522      const-string v3, "SystemServer"
1523
1524      const-string v9, "Throttle Service"
1525 @@ -1162,22 +1201,22 @@
1526      move-object/from16 v0, v110
1527
1528      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
1529 -    :try_end_3cb
1530 -    .catch Ljava/lang/Throwable; {:try_start_3bd .. :try_end_3cb} :catch_8a1
1531 +    :try_end_3d0
1532 +    .catch Ljava/lang/Throwable; {:try_start_3c2 .. :try_end_3d0} :catch_8a6
1533
1534 -    :try_start_3cb
1535 +    :try_start_3d0
1536      const-string v3, "throttle"
1537
1538      move-object/from16 v0, v110
1539
1540      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1541 -    :try_end_3d2
1542 -    .catch Ljava/lang/Throwable; {:try_start_3cb .. :try_end_3d2} :catch_a82
1543 +    :try_end_3d7
1544 +    .catch Ljava/lang/Throwable; {:try_start_3d0 .. :try_end_3d7} :catch_a87
1545
1546      move-object/from16 v109, v110
1547
1548 -    :goto_3d4
1549 -    :try_start_3d4
1550 +    :goto_3d9
1551 +    :try_start_3d9
1552      const-string v3, "SystemServer"
1553
1554      const-string v9, "UpdateLock Service"
1555 @@ -1191,16 +1230,16 @@
1556      invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
1557
1558      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1559 -    :try_end_3e5
1560 -    .catch Ljava/lang/Throwable; {:try_start_3d4 .. :try_end_3e5} :catch_8ad
1561 +    :try_end_3ea
1562 +    .catch Ljava/lang/Throwable; {:try_start_3d9 .. :try_end_3ea} :catch_8b2
1563
1564 -    :goto_3e5
1565 -    if-eqz v84, :cond_3ea
1566 +    :goto_3ea
1567 +    if-eqz v84, :cond_3ef
1568
1569      invoke-virtual/range {v84 .. v84}, Lcom/android/server/MountService;->waitForAsecScan()V
1570
1571 -    :cond_3ea
1572 -    :try_start_3ea
1573 +    :cond_3ef
1574 +    :try_start_3ef
1575      const-string v3, "SystemServer"
1576
1577      const-string v9, "Profile Manager"
1578 @@ -1212,40 +1251,40 @@
1579      move-object/from16 v0, v96
1580
1581      invoke-direct {v0, v4}, Lcom/android/server/ProfileManagerService;-><init>(Landroid/content/Context;)V
1582 -    :try_end_3f8
1583 -    .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3f8} :catch_8b9
1584 +    :try_end_3fd
1585 +    .catch Ljava/lang/Throwable; {:try_start_3ef .. :try_end_3fd} :catch_8be
1586
1587 -    :try_start_3f8
1588 +    :try_start_3fd
1589      const-string v3, "profile"
1590
1591      move-object/from16 v0, v96
1592
1593      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1594 -    :try_end_3ff
1595 -    .catch Ljava/lang/Throwable; {:try_start_3f8 .. :try_end_3ff} :catch_a7d
1596 +    :try_end_404
1597 +    .catch Ljava/lang/Throwable; {:try_start_3fd .. :try_end_404} :catch_a82
1598
1599      move-object/from16 v95, v96
1600
1601 -    :goto_401
1602 -    if-eqz v42, :cond_406
1603 -
1604 -    :try_start_403
1605 -    invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
1606 -    :try_end_406
1607 -    .catch Ljava/lang/Throwable; {:try_start_403 .. :try_end_406} :catch_8c5
1608 -
1609 -    :cond_406
1610      :goto_406
1611 -    if-eqz v58, :cond_40b
1612 +    if-eqz v42, :cond_40b
1613
1614      :try_start_408
1615 -    invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
1616 +    invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
1617      :try_end_40b
1618 -    .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8d1
1619 +    .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8ca
1620
1621      :cond_40b
1622      :goto_40b
1623 -    :try_start_40b
1624 +    if-eqz v58, :cond_410
1625 +
1626 +    :try_start_40d
1627 +    invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
1628 +    :try_end_410
1629 +    .catch Ljava/lang/Throwable; {:try_start_40d .. :try_end_410} :catch_8d6
1630 +
1631 +    :cond_410
1632 +    :goto_410
1633 +    :try_start_410
1634      const-string v3, "SystemServer"
1635
1636      const-string v9, "Notification Manager"
1637 @@ -1261,10 +1300,10 @@
1638      move-object/from16 v2, v77
1639
1640      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
1641 -    :try_end_41d
1642 -    .catch Ljava/lang/Throwable; {:try_start_40b .. :try_end_41d} :catch_8dd
1643 +    :try_end_422
1644 +    .catch Ljava/lang/Throwable; {:try_start_410 .. :try_end_422} :catch_8e2
1645
1646 -    :try_start_41d
1647 +    :try_start_422
1648      const-string v3, "notification"
1649
1650      move-object/from16 v0, v91
1651 @@ -1274,13 +1313,13 @@
1652      move-object/from16 v0, v91
1653
1654      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
1655 -    :try_end_429
1656 -    .catch Ljava/lang/Throwable; {:try_start_41d .. :try_end_429} :catch_a78
1657 +    :try_end_42e
1658 +    .catch Ljava/lang/Throwable; {:try_start_422 .. :try_end_42e} :catch_a7d
1659
1660      move-object/from16 v90, v91
1661
1662 -    :goto_42b
1663 -    :try_start_42b
1664 +    :goto_430
1665 +    :try_start_430
1666      const-string v3, "SystemServer"
1667
1668      const-string v9, "Device Storage Monitor"
1669 @@ -1294,11 +1333,11 @@
1670      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
1671
1672      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1673 -    :try_end_43c
1674 -    .catch Ljava/lang/Throwable; {:try_start_42b .. :try_end_43c} :catch_8e9
1675 +    :try_end_441
1676 +    .catch Ljava/lang/Throwable; {:try_start_430 .. :try_end_441} :catch_8ee
1677
1678 -    :goto_43c
1679 -    :try_start_43c
1680 +    :goto_441
1681 +    :try_start_441
1682      const-string v3, "SystemServer"
1683
1684      const-string v9, "Location Manager"
1685 @@ -1310,22 +1349,22 @@
1686      move-object/from16 v0, v80
1687
1688      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
1689 -    :try_end_44a
1690 -    .catch Ljava/lang/Throwable; {:try_start_43c .. :try_end_44a} :catch_8f5
1691 +    :try_end_44f
1692 +    .catch Ljava/lang/Throwable; {:try_start_441 .. :try_end_44f} :catch_8fa
1693
1694 -    :try_start_44a
1695 +    :try_start_44f
1696      const-string v3, "location"
1697
1698      move-object/from16 v0, v80
1699
1700      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1701 -    :try_end_451
1702 -    .catch Ljava/lang/Throwable; {:try_start_44a .. :try_end_451} :catch_a73
1703 +    :try_end_456
1704 +    .catch Ljava/lang/Throwable; {:try_start_44f .. :try_end_456} :catch_a78
1705
1706      move-object/from16 v79, v80
1707
1708 -    :goto_453
1709 -    :try_start_453
1710 +    :goto_458
1711 +    :try_start_458
1712      const-string v3, "SystemServer"
1713
1714      const-string v9, "Country Detector"
1715 @@ -1337,22 +1376,22 @@
1716      move-object/from16 v0, v60
1717
1718      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
1719 -    :try_end_461
1720 -    .catch Ljava/lang/Throwable; {:try_start_453 .. :try_end_461} :catch_901
1721 +    :try_end_466
1722 +    .catch Ljava/lang/Throwable; {:try_start_458 .. :try_end_466} :catch_906
1723
1724 -    :try_start_461
1725 +    :try_start_466
1726      const-string v3, "country_detector"
1727
1728      move-object/from16 v0, v60
1729
1730      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1731 -    :try_end_468
1732 -    .catch Ljava/lang/Throwable; {:try_start_461 .. :try_end_468} :catch_a6e
1733 +    :try_end_46d
1734 +    .catch Ljava/lang/Throwable; {:try_start_466 .. :try_end_46d} :catch_a73
1735
1736      move-object/from16 v59, v60
1737
1738 -    :goto_46a
1739 -    :try_start_46a
1740 +    :goto_46f
1741 +    :try_start_46f
1742      const-string v3, "SystemServer"
1743
1744      const-string v9, "Search Service"
1745 @@ -1366,11 +1405,11 @@
1746      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
1747
1748      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1749 -    :try_end_47b
1750 -    .catch Ljava/lang/Throwable; {:try_start_46a .. :try_end_47b} :catch_90d
1751 +    :try_end_480
1752 +    .catch Ljava/lang/Throwable; {:try_start_46f .. :try_end_480} :catch_912
1753
1754 -    :goto_47b
1755 -    :try_start_47b
1756 +    :goto_480
1757 +    :try_start_480
1758      const-string v3, "SystemServer"
1759
1760      const-string v9, "DropBox Service"
1761 @@ -1390,10 +1429,10 @@
1762      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
1763
1764      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1765 -    :try_end_493
1766 -    .catch Ljava/lang/Throwable; {:try_start_47b .. :try_end_493} :catch_919
1767 +    :try_end_498
1768 +    .catch Ljava/lang/Throwable; {:try_start_480 .. :try_end_498} :catch_91e
1769
1770 -    :goto_493
1771 +    :goto_498
1772      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
1773
1774      move-result-object v3
1775 @@ -1404,38 +1443,38 @@
1776
1777      move-result v3
1778
1779 -    if-eqz v3, :cond_4b9
1780 +    if-eqz v3, :cond_4be
1781
1782 -    :try_start_4a0
1783 +    :try_start_4a5
1784      const-string v3, "SystemServer"
1785
1786      const-string v9, "Wallpaper Service"
1787
1788      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1789
1790 -    if-nez v16, :cond_4b9
1791 +    if-nez v16, :cond_4be
1792
1793      new-instance v121, Lcom/android/server/WallpaperManagerService;
1794
1795      move-object/from16 v0, v121
1796
1797      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
1798 -    :try_end_4b0
1799 -    .catch Ljava/lang/Throwable; {:try_start_4a0 .. :try_end_4b0} :catch_925
1800 +    :try_end_4b5
1801 +    .catch Ljava/lang/Throwable; {:try_start_4a5 .. :try_end_4b5} :catch_92a
1802
1803 -    :try_start_4b0
1804 +    :try_start_4b5
1805      const-string v3, "wallpaper"
1806
1807      move-object/from16 v0, v121
1808
1809      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1810 -    :try_end_4b7
1811 -    .catch Ljava/lang/Throwable; {:try_start_4b0 .. :try_end_4b7} :catch_a69
1812 +    :try_end_4bc
1813 +    .catch Ljava/lang/Throwable; {:try_start_4b5 .. :try_end_4bc} :catch_a6e
1814
1815      move-object/from16 v120, v121
1816
1817 -    :cond_4b9
1818 -    :goto_4b9
1819 +    :cond_4be
1820 +    :goto_4be
1821      const-string v3, "0"
1822
1823      const-string v9, "system_init.startaudioservice"
1824 @@ -1448,9 +1487,9 @@
1825
1826      move-result v3
1827
1828 -    if-nez v3, :cond_4d8
1829 +    if-nez v3, :cond_4dd
1830
1831 -    :try_start_4c7
1832 +    :try_start_4cc
1833      const-string v3, "SystemServer"
1834
1835      const-string v9, "Audio Service"
1836 @@ -1464,12 +1503,12 @@
1837      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
1838
1839      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1840 -    :try_end_4d8
1841 -    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d8} :catch_931
1842 +    :try_end_4dd
1843 +    .catch Ljava/lang/Throwable; {:try_start_4cc .. :try_end_4dd} :catch_936
1844
1845 -    :cond_4d8
1846 -    :goto_4d8
1847 -    :try_start_4d8
1848 +    :cond_4dd
1849 +    :goto_4dd
1850 +    :try_start_4dd
1851      const-string v3, "SystemServer"
1852
1853      const-string v9, "Dock Observer"
1854 @@ -1481,15 +1520,15 @@
1855      move-object/from16 v0, v65
1856
1857      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
1858 -    :try_end_4e6
1859 -    .catch Ljava/lang/Throwable; {:try_start_4d8 .. :try_end_4e6} :catch_93d
1860 +    :try_end_4eb
1861 +    .catch Ljava/lang/Throwable; {:try_start_4dd .. :try_end_4eb} :catch_942
1862
1863      move-object/from16 v64, v65
1864
1865 -    :goto_4e8
1866 -    if-eqz v73, :cond_4fa
1867 +    :goto_4ed
1868 +    if-eqz v73, :cond_4ff
1869
1870 -    :try_start_4ea
1871 +    :try_start_4ef
1872      const-string v3, "SystemServer"
1873
1874      const-string v9, "Rotation Switch Observer"
1875 @@ -1501,14 +1540,14 @@
1876      move-object/from16 v0, v102
1877
1878      invoke-direct {v0, v4}, Lcom/android/server/RotationSwitchObserver;-><init>(Landroid/content/Context;)V
1879 -    :try_end_4f8
1880 -    .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_949
1881 +    :try_end_4fd
1882 +    .catch Ljava/lang/Throwable; {:try_start_4ef .. :try_end_4fd} :catch_94e
1883
1884      move-object/from16 v101, v102
1885
1886 -    :cond_4fa
1887 -    :goto_4fa
1888 -    :try_start_4fa
1889 +    :cond_4ff
1890 +    :goto_4ff
1891 +    :try_start_4ff
1892      const-string v3, "SystemServer"
1893
1894      const-string v9, "Wired Accessory Observer"
1895 @@ -1518,11 +1557,11 @@
1896      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
1897
1898      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
1899 -    :try_end_506
1900 -    .catch Ljava/lang/Throwable; {:try_start_4fa .. :try_end_506} :catch_955
1901 +    :try_end_50b
1902 +    .catch Ljava/lang/Throwable; {:try_start_4ff .. :try_end_50b} :catch_95a
1903
1904 -    :goto_506
1905 -    :try_start_506
1906 +    :goto_50b
1907 +    :try_start_50b
1908      const-string v3, "SystemServer"
1909
1910      const-string v9, "USB Service"
1911 @@ -1534,22 +1573,22 @@
1912      move-object/from16 v0, v116
1913
1914      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
1915 -    :try_end_514
1916 -    .catch Ljava/lang/Throwable; {:try_start_506 .. :try_end_514} :catch_961
1917 +    :try_end_519
1918 +    .catch Ljava/lang/Throwable; {:try_start_50b .. :try_end_519} :catch_966
1919
1920 -    :try_start_514
1921 +    :try_start_519
1922      const-string v3, "usb"
1923
1924      move-object/from16 v0, v116
1925
1926      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1927 -    :try_end_51b
1928 -    .catch Ljava/lang/Throwable; {:try_start_514 .. :try_end_51b} :catch_a64
1929 +    :try_end_520
1930 +    .catch Ljava/lang/Throwable; {:try_start_519 .. :try_end_520} :catch_a69
1931
1932      move-object/from16 v115, v116
1933
1934 -    :goto_51d
1935 -    :try_start_51d
1936 +    :goto_522
1937 +    :try_start_522
1938      const-string v3, "SystemServer"
1939
1940      const-string v9, "Serial Service"
1941 @@ -1561,22 +1600,22 @@
1942      move-object/from16 v0, v104
1943
1944      invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
1945 -    :try_end_52b
1946 -    .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_96d
1947 +    :try_end_530
1948 +    .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_972
1949
1950 -    :try_start_52b
1951 +    :try_start_530
1952      const-string v3, "serial"
1953
1954      move-object/from16 v0, v104
1955
1956      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1957 -    :try_end_532
1958 -    .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_a5f
1959 +    :try_end_537
1960 +    .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_a64
1961
1962      move-object/from16 v103, v104
1963
1964 -    :goto_534
1965 -    :try_start_534
1966 +    :goto_539
1967 +    :try_start_539
1968      const-string v3, "SystemServer"
1969
1970      const-string v9, "UI Mode Manager Service"
1971 @@ -1588,13 +1627,13 @@
1972      move-object/from16 v0, v114
1973
1974      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
1975 -    :try_end_542
1976 -    .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_979
1977 +    :try_end_547
1978 +    .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_97e
1979
1980      move-object/from16 v113, v114
1981
1982 -    :goto_544
1983 -    :try_start_544
1984 +    :goto_549
1985 +    :try_start_549
1986      const-string v3, "SystemServer"
1987
1988      const-string v9, "Backup Service"
1989 @@ -1608,11 +1647,11 @@
1990      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
1991
1992      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1993 -    :try_end_555
1994 -    .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_985
1995 +    :try_end_55a
1996 +    .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_98a
1997
1998 -    :goto_555
1999 -    :try_start_555
2000 +    :goto_55a
2001 +    :try_start_55a
2002      const-string v3, "SystemServer"
2003
2004      const-string v9, "AppWidget Service"
2005 @@ -1624,22 +1663,22 @@
2006      move-object/from16 v0, v46
2007
2008      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
2009 -    :try_end_563
2010 -    .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_563} :catch_991
2011 +    :try_end_568
2012 +    .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_568} :catch_996
2013
2014 -    :try_start_563
2015 +    :try_start_568
2016      const-string v3, "appwidget"
2017
2018      move-object/from16 v0, v46
2019
2020      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2021 -    :try_end_56a
2022 -    .catch Ljava/lang/Throwable; {:try_start_563 .. :try_end_56a} :catch_a5a
2023 +    :try_end_56f
2024 +    .catch Ljava/lang/Throwable; {:try_start_568 .. :try_end_56f} :catch_a5f
2025
2026      move-object/from16 v45, v46
2027
2028 -    :goto_56c
2029 -    :try_start_56c
2030 +    :goto_571
2031 +    :try_start_571
2032      const-string v3, "SystemServer"
2033
2034      const-string v9, "Recognition Service"
2035 @@ -1651,13 +1690,13 @@
2036      move-object/from16 v0, v100
2037
2038      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
2039 -    :try_end_57a
2040 -    .catch Ljava/lang/Throwable; {:try_start_56c .. :try_end_57a} :catch_99d
2041 +    :try_end_57f
2042 +    .catch Ljava/lang/Throwable; {:try_start_571 .. :try_end_57f} :catch_9a2
2043
2044      move-object/from16 v99, v100
2045
2046 -    :goto_57c
2047 -    :try_start_57c
2048 +    :goto_581
2049 +    :try_start_581
2050      const-string v3, "SystemServer"
2051
2052      const-string v9, "DiskStats Service"
2053 @@ -1671,11 +1710,11 @@
2054      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
2055
2056      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2057 -    :try_end_58d
2058 -    .catch Ljava/lang/Throwable; {:try_start_57c .. :try_end_58d} :catch_9a9
2059 +    :try_end_592
2060 +    .catch Ljava/lang/Throwable; {:try_start_581 .. :try_end_592} :catch_9ae
2061
2062 -    :goto_58d
2063 -    :try_start_58d
2064 +    :goto_592
2065 +    :try_start_592
2066      const-string v3, "SystemServer"
2067
2068      const-string v9, "SamplingProfiler Service"
2069 @@ -1689,11 +1728,11 @@
2070      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
2071
2072      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2073 -    :try_end_59e
2074 -    .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_59e} :catch_9b5
2075 +    :try_end_5a3
2076 +    .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_5a3} :catch_9ba
2077
2078 -    :goto_59e
2079 -    :try_start_59e
2080 +    :goto_5a3
2081 +    :try_start_5a3
2082      const-string v3, "SystemServer"
2083
2084      const-string v9, "NetworkTimeUpdateService"
2085 @@ -1705,13 +1744,13 @@
2086      move-object/from16 v0, v89
2087
2088      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
2089 -    :try_end_5ac
2090 -    .catch Ljava/lang/Throwable; {:try_start_59e .. :try_end_5ac} :catch_9c1
2091 +    :try_end_5b1
2092 +    .catch Ljava/lang/Throwable; {:try_start_5a3 .. :try_end_5b1} :catch_9c6
2093
2094      move-object/from16 v88, v89
2095
2096 -    :goto_5ae
2097 -    :try_start_5ae
2098 +    :goto_5b3
2099 +    :try_start_5b3
2100      const-string v3, "SystemServer"
2101
2102      const-string v9, "CommonTimeManagementService"
2103 @@ -1723,22 +1762,22 @@
2104      move-object/from16 v0, v54
2105
2106      invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
2107 -    :try_end_5bc
2108 -    .catch Ljava/lang/Throwable; {:try_start_5ae .. :try_end_5bc} :catch_9cd
2109 +    :try_end_5c1
2110 +    .catch Ljava/lang/Throwable; {:try_start_5b3 .. :try_end_5c1} :catch_9d2
2111
2112 -    :try_start_5bc
2113 +    :try_start_5c1
2114      const-string v3, "commontime_management"
2115
2116      move-object/from16 v0, v54
2117
2118      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2119 -    :try_end_5c3
2120 -    .catch Ljava/lang/Throwable; {:try_start_5bc .. :try_end_5c3} :catch_a55
2121 +    :try_end_5c8
2122 +    .catch Ljava/lang/Throwable; {:try_start_5c1 .. :try_end_5c8} :catch_a5a
2123
2124      move-object/from16 v53, v54
2125
2126 -    :goto_5c5
2127 -    :try_start_5c5
2128 +    :goto_5ca
2129 +    :try_start_5ca
2130      const-string v3, "SystemServer"
2131
2132      const-string v9, "CertBlacklister"
2133 @@ -1748,10 +1787,10 @@
2134      new-instance v3, Lcom/android/server/CertBlacklister;
2135
2136      invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
2137 -    :try_end_5d1
2138 -    .catch Ljava/lang/Throwable; {:try_start_5c5 .. :try_end_5d1} :catch_9d9
2139 +    :try_end_5d6
2140 +    .catch Ljava/lang/Throwable; {:try_start_5ca .. :try_end_5d6} :catch_9de
2141
2142 -    :goto_5d1
2143 +    :goto_5d6
2144      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
2145
2146      move-result-object v3
2147 @@ -1762,9 +1801,9 @@
2148
2149      move-result v3
2150
2151 -    if-eqz v3, :cond_5f5
2152 +    if-eqz v3, :cond_5fa
2153
2154 -    :try_start_5de
2155 +    :try_start_5e3
2156      const-string v3, "SystemServer"
2157
2158      const-string v9, "Dreams Service"
2159 @@ -1776,23 +1815,23 @@
2160      move-object/from16 v0, v67
2161
2162      invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
2163 -    :try_end_5ec
2164 -    .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5ec} :catch_9e5
2165 +    :try_end_5f1
2166 +    .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5f1} :catch_9ea
2167
2168 -    :try_start_5ec
2169 +    :try_start_5f1
2170      const-string v3, "dreams"
2171
2172      move-object/from16 v0, v67
2173
2174      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2175 -    :try_end_5f3
2176 -    .catch Ljava/lang/Throwable; {:try_start_5ec .. :try_end_5f3} :catch_a51
2177 +    :try_end_5f8
2178 +    .catch Ljava/lang/Throwable; {:try_start_5f1 .. :try_end_5f8} :catch_a56
2179
2180      move-object/from16 v66, v67
2181
2182 -    :cond_5f5
2183 -    :goto_5f5
2184 -    :try_start_5f5
2185 +    :cond_5fa
2186 +    :goto_5fa
2187 +    :try_start_5fa
2188      const-string v3, "SystemServer"
2189
2190      const-string v9, "AssetRedirectionManager Service"
2191 @@ -1806,10 +1845,10 @@
2192      invoke-direct {v9, v4}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
2193
2194      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2195 -    :try_end_606
2196 -    .catch Ljava/lang/Throwable; {:try_start_5f5 .. :try_end_606} :catch_9f1
2197 +    :try_end_60b
2198 +    .catch Ljava/lang/Throwable; {:try_start_5fa .. :try_end_60b} :catch_9f6
2199
2200 -    :goto_606
2201 +    :goto_60b
2202      move-object/from16 v0, p0
2203
2204      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
2205 @@ -1854,7 +1893,7 @@
2206
2207      move-result v29
2208
2209 -    if-eqz v29, :cond_9fd
2210 +    if-eqz v29, :cond_a02
2211
2212      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
2213
2214 @@ -1872,38 +1911,38 @@
2215
2216      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
2217
2218 -    :goto_647
2219 -    :try_start_647
2220 -    invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
2221 -    :try_end_64a
2222 -    .catch Ljava/lang/Throwable; {:try_start_647 .. :try_end_64a} :catch_a06
2223 -
2224 -    :goto_64a
2225 -    if-eqz v62, :cond_64f
2226 -
2227 +    :goto_64c
2228      :try_start_64c
2229 -    invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
2230 +    invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
2231      :try_end_64f
2232 -    .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a12
2233 +    .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a0b
2234
2235 -    :cond_64f
2236      :goto_64f
2237 -    if-eqz v90, :cond_654
2238 +    if-eqz v62, :cond_654
2239
2240      :try_start_651
2241 -    invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
2242 +    invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
2243      :try_end_654
2244 -    .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a1e
2245 +    .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a17
2246
2247      :cond_654
2248      :goto_654
2249 -    :try_start_654
2250 +    if-eqz v90, :cond_659
2251 +
2252 +    :try_start_656
2253 +    invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
2254 +    :try_end_659
2255 +    .catch Ljava/lang/Throwable; {:try_start_656 .. :try_end_659} :catch_a23
2256 +
2257 +    :cond_659
2258 +    :goto_659
2259 +    :try_start_659
2260      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
2261 -    :try_end_657
2262 -    .catch Ljava/lang/Throwable; {:try_start_654 .. :try_end_657} :catch_a2a
2263 +    :try_end_65c
2264 +    .catch Ljava/lang/Throwable; {:try_start_659 .. :try_end_65c} :catch_a2f
2265
2266 -    :goto_657
2267 -    if-eqz v29, :cond_660
2268 +    :goto_65c
2269 +    if-eqz v29, :cond_665
2270
2271      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
2272
2273 @@ -1911,7 +1950,7 @@
2274
2275      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
2276
2277 -    :cond_660
2278 +    :cond_665
2279      invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
2280
2281      move-result-object v55
2282 @@ -1948,18 +1987,18 @@
2283
2284      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
2285
2286 -    :try_start_688
2287 +    :try_start_68d
2288      invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->systemReady()V
2289 -    :try_end_68b
2290 -    .catch Ljava/lang/Throwable; {:try_start_688 .. :try_end_68b} :catch_a36
2291 +    :try_end_690
2292 +    .catch Ljava/lang/Throwable; {:try_start_68d .. :try_end_690} :catch_a3b
2293
2294 -    :goto_68b
2295 -    :try_start_68b
2296 +    :goto_690
2297 +    :try_start_690
2298      invoke-virtual/range {v81 .. v81}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
2299 -    :try_end_68e
2300 -    .catch Ljava/lang/Throwable; {:try_start_68b .. :try_end_68e} :catch_a42
2301 +    :try_end_693
2302 +    .catch Ljava/lang/Throwable; {:try_start_690 .. :try_end_693} :catch_a47
2303
2304 -    :goto_68e
2305 +    :goto_693
2306      new-instance v71, Landroid/content/IntentFilter;
2307
2308      invoke-direct/range {v71 .. v71}, Landroid/content/IntentFilter;-><init>()V
2309 @@ -2072,7 +2111,7 @@
2310
2311      move-result v3
2312
2313 -    if-eqz v3, :cond_712
2314 +    if-eqz v3, :cond_717
2315
2316      const-string v3, "SystemServer"
2317
2318 @@ -2080,7 +2119,7 @@
2319
2320      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
2321
2322 -    :cond_712
2323 +    :cond_717
2324      invoke-static {}, Landroid/os/Looper;->loop()V
2325
2326      const-string v3, "SystemServer"
2327 @@ -2091,25 +2130,25 @@
2328
2329      return-void
2330
2331 -    :cond_71d
2332 +    :cond_722
2333      const/16 v98, 0x0
2334
2335      goto/16 :goto_35
2336
2337 -    :cond_721
2338 +    :cond_726
2339      const/16 v97, 0x0
2340
2341      goto/16 :goto_47
2342
2343 -    :cond_725
2344 +    :cond_72a
2345      invoke-static/range {v70 .. v70}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
2346
2347      move-result v69
2348
2349      goto/16 :goto_60
2350
2351 -    :cond_72b
2352 -    :try_start_72b
2353 +    :cond_730
2354 +    :try_start_730
2355      const-string v3, "1"
2356
2357      move-object/from16 v0, v61
2358 @@ -2130,15 +2169,15 @@
2359
2360      goto/16 :goto_119
2361
2362 -    :cond_740
2363 +    :cond_745
2364      const/4 v3, 0x0
2365
2366      goto/16 :goto_11c
2367
2368 -    :catch_743
2369 +    :catch_748
2370      move-exception v68
2371
2372 -    :goto_744
2373 +    :goto_749
2374      const-string v3, "SystemServer"
2375
2376      const-string v9, "Failure starting Account Manager"
2377 @@ -2146,19 +2185,19 @@
2378      move-object/from16 v0, v68
2379
2380      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2381 -    :try_end_74d
2382 -    .catch Ljava/lang/RuntimeException; {:try_start_72b .. :try_end_74d} :catch_74f
2383 +    :try_end_752
2384 +    .catch Ljava/lang/RuntimeException; {:try_start_730 .. :try_end_752} :catch_754
2385
2386      goto/16 :goto_14a
2387
2388 -    :catch_74f
2389 +    :catch_754
2390      move-exception v68
2391
2392      move-object/from16 v7, v44
2393
2394      move-object/from16 v5, v47
2395
2396 -    :goto_754
2397 +    :goto_759
2398      const-string v3, "System"
2399
2400      const-string v9, "******************************************"
2401 @@ -2173,51 +2212,51 @@
2402
2403      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2404
2405 -    goto/16 :goto_212
2406 +    goto/16 :goto_217
2407
2408 -    :cond_766
2409 +    :cond_76b
2410      const/4 v3, 0x0
2411
2412      goto/16 :goto_157
2413
2414 -    :cond_769
2415 +    :cond_76e
2416      const/4 v3, 0x0
2417
2418      move v9, v3
2419
2420 -    goto/16 :goto_1d5
2421 +    goto/16 :goto_1da
2422
2423 -    :cond_76d
2424 +    :cond_772
2425      const/4 v3, 0x0
2426
2427 -    goto/16 :goto_1d8
2428 +    goto/16 :goto_1dd
2429
2430 -    :cond_770
2431 +    :cond_775
2432      const/4 v3, 0x1
2433
2434      move/from16 v0, v69
2435
2436 -    if-ne v0, v3, :cond_784
2437 +    if-ne v0, v3, :cond_789
2438
2439 -    :try_start_775
2440 +    :try_start_77a
2441      const-string v3, "SystemServer"
2442
2443      const-string v9, "No Bluetooth Service (factory test)"
2444
2445      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
2446
2447 -    goto/16 :goto_20e
2448 +    goto/16 :goto_213
2449
2450 -    :catch_77e
2451 +    :catch_783
2452      move-exception v68
2453
2454      move-object/from16 v117, v118
2455
2456      move-object/from16 v77, v78
2457
2458 -    goto :goto_754
2459 +    goto :goto_759
2460
2461 -    :cond_784
2462 +    :cond_789
2463      const-string v3, "SystemServer"
2464
2465      const-string v9, "Bluetooth Service"
2466 @@ -2229,10 +2268,10 @@
2467      move-object/from16 v0, v49
2468
2469      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
2470 -    :try_end_792
2471 -    .catch Ljava/lang/RuntimeException; {:try_start_775 .. :try_end_792} :catch_77e
2472 +    :try_end_797
2473 +    .catch Ljava/lang/RuntimeException; {:try_start_77a .. :try_end_797} :catch_783
2474
2475 -    :try_start_792
2476 +    :try_start_797
2477      const-string v3, "bluetooth"
2478
2479      move-object/from16 v0, v49
2480 @@ -2253,7 +2292,7 @@
2481
2482      move-result v3
2483
2484 -    if-nez v3, :cond_7bf
2485 +    if-nez v3, :cond_7c4
2486
2487      new-instance v51, Landroid/server/BluetoothA2dpService;
2488
2489 @@ -2262,10 +2301,10 @@
2490      move-object/from16 v1, v49
2491
2492      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
2493 -    :try_end_7b3
2494 -    .catch Ljava/lang/RuntimeException; {:try_start_792 .. :try_end_7b3} :catch_aea
2495 +    :try_end_7b8
2496 +    .catch Ljava/lang/RuntimeException; {:try_start_797 .. :try_end_7b8} :catch_aef
2497
2498 -    :try_start_7b3
2499 +    :try_start_7b8
2500      const-string v3, "bluetooth_a2dp"
2501
2502      move-object/from16 v0, v51
2503 @@ -2273,13 +2312,13 @@
2504      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2505
2506      invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
2507 -    :try_end_7bd
2508 -    .catch Ljava/lang/RuntimeException; {:try_start_7b3 .. :try_end_7bd} :catch_af3
2509 +    :try_end_7c2
2510 +    .catch Ljava/lang/RuntimeException; {:try_start_7b8 .. :try_end_7c2} :catch_af8
2511
2512      move-object/from16 v50, v51
2513
2514 -    :cond_7bf
2515 -    :try_start_7bf
2516 +    :cond_7c4
2517 +    :try_start_7c4
2518      move-object/from16 v0, p0
2519
2520      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
2521 @@ -2292,21 +2331,21 @@
2522
2523      move-result v52
2524
2525 -    if-eqz v52, :cond_7cf
2526 +    if-eqz v52, :cond_7d4
2527
2528      invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->enable()Z
2529 -    :try_end_7cf
2530 -    .catch Ljava/lang/RuntimeException; {:try_start_7bf .. :try_end_7cf} :catch_aea
2531 +    :try_end_7d4
2532 +    .catch Ljava/lang/RuntimeException; {:try_start_7c4 .. :try_end_7d4} :catch_aef
2533
2534 -    :cond_7cf
2535 +    :cond_7d4
2536      move-object/from16 v48, v49
2537
2538 -    goto/16 :goto_20e
2539 +    goto/16 :goto_213
2540
2541 -    :catch_7d3
2542 +    :catch_7d8
2543      move-exception v68
2544
2545 -    :goto_7d4
2546 +    :goto_7d9
2547      const-string v3, "starting Input Manager Service"
2548
2549      move-object/from16 v0, p0
2550 @@ -2315,9 +2354,9 @@
2551
2552      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2553
2554 -    goto/16 :goto_253
2555 +    goto/16 :goto_258
2556
2557 -    :catch_7df
2558 +    :catch_7e4
2559      move-exception v68
2560
2561      const-string v3, "starting Accessibility Manager"
2562 @@ -2328,9 +2367,9 @@
2563
2564      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2565
2566 -    goto/16 :goto_264
2567 +    goto/16 :goto_269
2568
2569 -    :catch_7eb
2570 +    :catch_7f0
2571      move-exception v68
2572
2573      const-string v3, "making display ready"
2574 @@ -2341,9 +2380,9 @@
2575
2576      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2577
2578 -    goto/16 :goto_267
2579 +    goto/16 :goto_26c
2580
2581 -    :catch_7f7
2582 +    :catch_7fc
2583      move-exception v68
2584
2585      const-string v3, "performing boot dexopt"
2586 @@ -2354,12 +2393,12 @@
2587
2588      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2589
2590 -    goto/16 :goto_26a
2591 +    goto/16 :goto_26f
2592
2593 -    :catch_803
2594 +    :catch_808
2595      move-exception v68
2596
2597 -    :goto_804
2598 +    :goto_809
2599      const-string v3, "starting Mount Service"
2600
2601      move-object/from16 v0, p0
2602 @@ -2368,12 +2407,12 @@
2603
2604      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2605
2606 -    goto/16 :goto_2a9
2607 +    goto/16 :goto_2ae
2608
2609 -    :catch_80f
2610 +    :catch_814
2611      move-exception v68
2612
2613 -    :goto_810
2614 +    :goto_815
2615      const-string v3, "starting LockSettingsService service"
2616
2617      move-object/from16 v0, p0
2618 @@ -2382,12 +2421,12 @@
2619
2620      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2621
2622 -    goto/16 :goto_2c0
2623 +    goto/16 :goto_2c5
2624
2625 -    :catch_81b
2626 +    :catch_820
2627      move-exception v68
2628
2629 -    :goto_81c
2630 +    :goto_821
2631      const-string v3, "starting DevicePolicyService"
2632
2633      move-object/from16 v0, p0
2634 @@ -2396,12 +2435,12 @@
2635
2636      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2637
2638 -    goto/16 :goto_2d7
2639 +    goto/16 :goto_2dc
2640
2641 -    :catch_827
2642 +    :catch_82c
2643      move-exception v68
2644
2645 -    :goto_828
2646 +    :goto_82d
2647      const-string v3, "starting StatusBarManagerService"
2648
2649      move-object/from16 v0, p0
2650 @@ -2410,9 +2449,9 @@
2651
2652      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2653
2654 -    goto/16 :goto_2f0
2655 +    goto/16 :goto_2f5
2656
2657 -    :catch_833
2658 +    :catch_838
2659      move-exception v68
2660
2661      const-string v3, "starting Clipboard Service"
2662 @@ -2423,9 +2462,9 @@
2663
2664      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2665
2666 -    goto/16 :goto_301
2667 +    goto/16 :goto_306
2668
2669 -    :catch_83f
2670 +    :catch_844
2671      move-exception v68
2672
2673      const-string v3, "starting NetworkManagement Service"
2674 @@ -2436,12 +2475,12 @@
2675
2676      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2677
2678 -    goto/16 :goto_311
2679 +    goto/16 :goto_316
2680
2681 -    :catch_84b
2682 +    :catch_850
2683      move-exception v68
2684
2685 -    :goto_84c
2686 +    :goto_851
2687      const-string v3, "starting Text Service Manager Service"
2688
2689      move-object/from16 v0, p0
2690 @@ -2450,12 +2489,12 @@
2691
2692      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2693
2694 -    goto/16 :goto_328
2695 +    goto/16 :goto_32d
2696
2697 -    :catch_857
2698 +    :catch_85c
2699      move-exception v68
2700
2701 -    :goto_858
2702 +    :goto_85d
2703      const-string v3, "starting NetworkStats Service"
2704
2705      move-object/from16 v0, p0
2706 @@ -2464,14 +2503,14 @@
2707
2708      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2709
2710 -    goto/16 :goto_33f
2711 +    goto/16 :goto_344
2712
2713 -    :catch_863
2714 +    :catch_868
2715      move-exception v68
2716
2717      move-object/from16 v8, v86
2718
2719 -    :goto_866
2720 +    :goto_86b
2721      const-string v3, "starting NetworkPolicy Service"
2722
2723      move-object/from16 v0, p0
2724 @@ -2480,12 +2519,12 @@
2725
2726      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2727
2728 -    goto/16 :goto_356
2729 +    goto/16 :goto_35b
2730
2731 -    :catch_871
2732 +    :catch_876
2733      move-exception v68
2734
2735 -    :goto_872
2736 +    :goto_877
2737      const-string v3, "starting Wi-Fi P2pService"
2738
2739      move-object/from16 v0, p0
2740 @@ -2494,12 +2533,12 @@
2741
2742      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2743
2744 -    goto/16 :goto_36d
2745 +    goto/16 :goto_372
2746
2747 -    :catch_87d
2748 +    :catch_882
2749      move-exception v68
2750
2751 -    :goto_87e
2752 +    :goto_883
2753      const-string v3, "starting Wi-Fi Service"
2754
2755      move-object/from16 v0, p0
2756 @@ -2508,12 +2547,12 @@
2757
2758      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2759
2760 -    goto/16 :goto_384
2761 +    goto/16 :goto_389
2762
2763 -    :catch_889
2764 +    :catch_88e
2765      move-exception v68
2766
2767 -    :goto_88a
2768 +    :goto_88f
2769      const-string v3, "starting Connectivity Service"
2770
2771      move-object/from16 v0, p0
2772 @@ -2522,9 +2561,9 @@
2773
2774      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2775
2776 -    goto/16 :goto_3ab
2777 +    goto/16 :goto_3b0
2778
2779 -    :catch_895
2780 +    :catch_89a
2781      move-exception v68
2782
2783      const-string v3, "starting Service Discovery Service"
2784 @@ -2535,12 +2574,12 @@
2785
2786      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2787
2788 -    goto/16 :goto_3bd
2789 +    goto/16 :goto_3c2
2790
2791 -    :catch_8a1
2792 +    :catch_8a6
2793      move-exception v68
2794
2795 -    :goto_8a2
2796 +    :goto_8a7
2797      const-string v3, "starting ThrottleService"
2798
2799      move-object/from16 v0, p0
2800 @@ -2549,9 +2588,9 @@
2801
2802      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2803
2804 -    goto/16 :goto_3d4
2805 +    goto/16 :goto_3d9
2806
2807 -    :catch_8ad
2808 +    :catch_8b2
2809      move-exception v68
2810
2811      const-string v3, "starting UpdateLockService"
2812 @@ -2562,12 +2601,12 @@
2813
2814      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2815
2816 -    goto/16 :goto_3e5
2817 +    goto/16 :goto_3ea
2818
2819 -    :catch_8b9
2820 +    :catch_8be
2821      move-exception v68
2822
2823 -    :goto_8ba
2824 +    :goto_8bf
2825      const-string v3, "SystemServer"
2826
2827      const-string v9, "Failure starting Profile Manager"
2828 @@ -2576,9 +2615,9 @@
2829
2830      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2831
2832 -    goto/16 :goto_401
2833 +    goto/16 :goto_406
2834
2835 -    :catch_8c5
2836 +    :catch_8ca
2837      move-exception v68
2838
2839      const-string v3, "making Account Manager Service ready"
2840 @@ -2589,9 +2628,9 @@
2841
2842      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2843
2844 -    goto/16 :goto_406
2845 +    goto/16 :goto_40b
2846
2847 -    :catch_8d1
2848 +    :catch_8d6
2849      move-exception v68
2850
2851      const-string v3, "making Content Service ready"
2852 @@ -2602,12 +2641,12 @@
2853
2854      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2855
2856 -    goto/16 :goto_40b
2857 +    goto/16 :goto_410
2858
2859 -    :catch_8dd
2860 +    :catch_8e2
2861      move-exception v68
2862
2863 -    :goto_8de
2864 +    :goto_8e3
2865      const-string v3, "starting Notification Manager"
2866
2867      move-object/from16 v0, p0
2868 @@ -2616,9 +2655,9 @@
2869
2870      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2871
2872 -    goto/16 :goto_42b
2873 +    goto/16 :goto_430
2874
2875 -    :catch_8e9
2876 +    :catch_8ee
2877      move-exception v68
2878
2879      const-string v3, "starting DeviceStorageMonitor service"
2880 @@ -2629,12 +2668,12 @@
2881
2882      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2883
2884 -    goto/16 :goto_43c
2885 +    goto/16 :goto_441
2886
2887 -    :catch_8f5
2888 +    :catch_8fa
2889      move-exception v68
2890
2891 -    :goto_8f6
2892 +    :goto_8fb
2893      const-string v3, "starting Location Manager"
2894
2895      move-object/from16 v0, p0
2896 @@ -2643,12 +2682,12 @@
2897
2898      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2899
2900 -    goto/16 :goto_453
2901 +    goto/16 :goto_458
2902
2903 -    :catch_901
2904 +    :catch_906
2905      move-exception v68
2906
2907 -    :goto_902
2908 +    :goto_907
2909      const-string v3, "starting Country Detector"
2910
2911      move-object/from16 v0, p0
2912 @@ -2657,9 +2696,9 @@
2913
2914      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2915
2916 -    goto/16 :goto_46a
2917 +    goto/16 :goto_46f
2918
2919 -    :catch_90d
2920 +    :catch_912
2921      move-exception v68
2922
2923      const-string v3, "starting Search Service"
2924 @@ -2670,9 +2709,9 @@
2925
2926      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2927
2928 -    goto/16 :goto_47b
2929 +    goto/16 :goto_480
2930
2931 -    :catch_919
2932 +    :catch_91e
2933      move-exception v68
2934
2935      const-string v3, "starting DropBoxManagerService"
2936 @@ -2683,12 +2722,12 @@
2937
2938      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2939
2940 -    goto/16 :goto_493
2941 +    goto/16 :goto_498
2942
2943 -    :catch_925
2944 +    :catch_92a
2945      move-exception v68
2946
2947 -    :goto_926
2948 +    :goto_92b
2949      const-string v3, "starting Wallpaper Service"
2950
2951      move-object/from16 v0, p0
2952 @@ -2697,9 +2736,9 @@
2953
2954      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2955
2956 -    goto/16 :goto_4b9
2957 +    goto/16 :goto_4be
2958
2959 -    :catch_931
2960 +    :catch_936
2961      move-exception v68
2962
2963      const-string v3, "starting Audio Service"
2964 @@ -2710,9 +2749,9 @@
2965
2966      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2967
2968 -    goto/16 :goto_4d8
2969 +    goto/16 :goto_4dd
2970
2971 -    :catch_93d
2972 +    :catch_942
2973      move-exception v68
2974
2975      const-string v3, "starting DockObserver"
2976 @@ -2723,9 +2762,9 @@
2977
2978      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2979
2980 -    goto/16 :goto_4e8
2981 +    goto/16 :goto_4ed
2982
2983 -    :catch_949
2984 +    :catch_94e
2985      move-exception v68
2986
2987      const-string v3, "starting RotationSwitchObserver"
2988 @@ -2736,9 +2775,9 @@
2989
2990      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2991
2992 -    goto/16 :goto_4fa
2993 +    goto/16 :goto_4ff
2994
2995 -    :catch_955
2996 +    :catch_95a
2997      move-exception v68
2998
2999      const-string v3, "starting WiredAccessoryObserver"
3000 @@ -2749,12 +2788,12 @@
3001
3002      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3003
3004 -    goto/16 :goto_506
3005 +    goto/16 :goto_50b
3006
3007 -    :catch_961
3008 +    :catch_966
3009      move-exception v68
3010
3011 -    :goto_962
3012 +    :goto_967
3013      const-string v3, "starting UsbService"
3014
3015      move-object/from16 v0, p0
3016 @@ -2763,12 +2802,12 @@
3017
3018      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3019
3020 -    goto/16 :goto_51d
3021 +    goto/16 :goto_522
3022
3023 -    :catch_96d
3024 +    :catch_972
3025      move-exception v68
3026
3027 -    :goto_96e
3028 +    :goto_973
3029      const-string v3, "SystemServer"
3030
3031      const-string v9, "Failure starting SerialService"
3032 @@ -2777,9 +2816,9 @@
3033
3034      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3035
3036 -    goto/16 :goto_534
3037 +    goto/16 :goto_539
3038
3039 -    :catch_979
3040 +    :catch_97e
3041      move-exception v68
3042
3043      const-string v3, "starting UiModeManagerService"
3044 @@ -2790,9 +2829,9 @@
3045
3046      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3047
3048 -    goto/16 :goto_544
3049 +    goto/16 :goto_549
3050
3051 -    :catch_985
3052 +    :catch_98a
3053      move-exception v68
3054
3055      const-string v3, "SystemServer"
3056 @@ -2803,12 +2842,12 @@
3057
3058      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3059
3060 -    goto/16 :goto_555
3061 +    goto/16 :goto_55a
3062
3063 -    :catch_991
3064 +    :catch_996
3065      move-exception v68
3066
3067 -    :goto_992
3068 +    :goto_997
3069      const-string v3, "starting AppWidget Service"
3070
3071      move-object/from16 v0, p0
3072 @@ -2817,9 +2856,9 @@
3073
3074      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3075
3076 -    goto/16 :goto_56c
3077 +    goto/16 :goto_571
3078
3079 -    :catch_99d
3080 +    :catch_9a2
3081      move-exception v68
3082
3083      const-string v3, "starting Recognition Service"
3084 @@ -2830,9 +2869,9 @@
3085
3086      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3087
3088 -    goto/16 :goto_57c
3089 +    goto/16 :goto_581
3090
3091 -    :catch_9a9
3092 +    :catch_9ae
3093      move-exception v68
3094
3095      const-string v3, "starting DiskStats Service"
3096 @@ -2843,9 +2882,9 @@
3097
3098      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3099
3100 -    goto/16 :goto_58d
3101 +    goto/16 :goto_592
3102
3103 -    :catch_9b5
3104 +    :catch_9ba
3105      move-exception v68
3106
3107      const-string v3, "starting SamplingProfiler Service"
3108 @@ -2856,9 +2895,9 @@
3109
3110      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3111
3112 -    goto/16 :goto_59e
3113 +    goto/16 :goto_5a3
3114
3115 -    :catch_9c1
3116 +    :catch_9c6
3117      move-exception v68
3118
3119      const-string v3, "starting NetworkTimeUpdate service"
3120 @@ -2869,12 +2908,12 @@
3121
3122      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3123
3124 -    goto/16 :goto_5ae
3125 +    goto/16 :goto_5b3
3126
3127 -    :catch_9cd
3128 +    :catch_9d2
3129      move-exception v68
3130
3131 -    :goto_9ce
3132 +    :goto_9d3
3133      const-string v3, "starting CommonTimeManagementService service"
3134
3135      move-object/from16 v0, p0
3136 @@ -2883,9 +2922,9 @@
3137
3138      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3139
3140 -    goto/16 :goto_5c5
3141 +    goto/16 :goto_5ca
3142
3143 -    :catch_9d9
3144 +    :catch_9de
3145      move-exception v68
3146
3147      const-string v3, "starting CertBlacklister"
3148 @@ -2896,12 +2935,12 @@
3149
3150      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3151
3152 -    goto/16 :goto_5d1
3153 +    goto/16 :goto_5d6
3154
3155 -    :catch_9e5
3156 +    :catch_9ea
3157      move-exception v68
3158
3159 -    :goto_9e6
3160 +    :goto_9eb
3161      const-string v3, "starting DreamManagerService"
3162
3163      move-object/from16 v0, p0
3164 @@ -2910,9 +2949,9 @@
3165
3166      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3167
3168 -    goto/16 :goto_5f5
3169 +    goto/16 :goto_5fa
3170
3171 -    :catch_9f1
3172 +    :catch_9f6
3173      move-exception v68
3174
3175      const-string v3, "SystemServer"
3176 @@ -2923,18 +2962,18 @@
3177
3178      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3179
3180 -    goto/16 :goto_606
3181 +    goto/16 :goto_60b
3182
3183 -    :cond_9fd
3184 +    :cond_a02
3185      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
3186
3187      move-result-object v3
3188
3189      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
3190
3191 -    goto/16 :goto_647
3192 +    goto/16 :goto_64c
3193
3194 -    :catch_a06
3195 +    :catch_a0b
3196      move-exception v68
3197
3198      const-string v3, "making Vibrator Service ready"
3199 @@ -2945,9 +2984,9 @@
3200
3201      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3202
3203 -    goto/16 :goto_64a
3204 +    goto/16 :goto_64f
3205
3206 -    :catch_a12
3207 +    :catch_a17
3208      move-exception v68
3209
3210      const-string v3, "making Device Policy Service ready"
3211 @@ -2958,9 +2997,9 @@
3212
3213      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3214
3215 -    goto/16 :goto_64f
3216 +    goto/16 :goto_654
3217
3218 -    :catch_a1e
3219 +    :catch_a23
3220      move-exception v68
3221
3222      const-string v3, "making Notification Service ready"
3223 @@ -2971,9 +3010,9 @@
3224
3225      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3226
3227 -    goto/16 :goto_654
3228 +    goto/16 :goto_659
3229
3230 -    :catch_a2a
3231 +    :catch_a2f
3232      move-exception v68
3233
3234      const-string v3, "making Window Manager Service ready"
3235 @@ -2984,9 +3023,9 @@
3236
3237      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3238
3239 -    goto/16 :goto_657
3240 +    goto/16 :goto_65c
3241
3242 -    :catch_a36
3243 +    :catch_a3b
3244      move-exception v68
3245
3246      const-string v3, "making Package Manager Service ready"
3247 @@ -2997,9 +3036,9 @@
3248
3249      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3250
3251 -    goto/16 :goto_68b
3252 +    goto/16 :goto_690
3253
3254 -    :catch_a42
3255 +    :catch_a47
3256      move-exception v68
3257
3258      const-string v3, "making Lock Settings Service ready"
3259 @@ -3010,171 +3049,171 @@
3260
3261      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3262
3263 -    goto/16 :goto_68e
3264 +    goto/16 :goto_693
3265
3266 -    :catch_a4e
3267 +    :catch_a53
3268      move-exception v3
3269
3270      goto/16 :goto_128
3271
3272 -    :catch_a51
3273 +    :catch_a56
3274      move-exception v68
3275
3276      move-object/from16 v66, v67
3277
3278 -    goto :goto_9e6
3279 +    goto :goto_9eb
3280
3281 -    :catch_a55
3282 +    :catch_a5a
3283      move-exception v68
3284
3285      move-object/from16 v53, v54
3286
3287 -    goto/16 :goto_9ce
3288 +    goto/16 :goto_9d3
3289
3290 -    :catch_a5a
3291 +    :catch_a5f
3292      move-exception v68
3293
3294      move-object/from16 v45, v46
3295
3296 -    goto/16 :goto_992
3297 +    goto/16 :goto_997
3298
3299 -    :catch_a5f
3300 +    :catch_a64
3301      move-exception v68
3302
3303      move-object/from16 v103, v104
3304
3305 -    goto/16 :goto_96e
3306 +    goto/16 :goto_973
3307
3308 -    :catch_a64
3309 +    :catch_a69
3310      move-exception v68
3311
3312      move-object/from16 v115, v116
3313
3314 -    goto/16 :goto_962
3315 +    goto/16 :goto_967
3316
3317 -    :catch_a69
3318 +    :catch_a6e
3319      move-exception v68
3320
3321      move-object/from16 v120, v121
3322
3323 -    goto/16 :goto_926
3324 +    goto/16 :goto_92b
3325
3326 -    :catch_a6e
3327 +    :catch_a73
3328      move-exception v68
3329
3330      move-object/from16 v59, v60
3331
3332 -    goto/16 :goto_902
3333 +    goto/16 :goto_907
3334
3335 -    :catch_a73
3336 +    :catch_a78
3337      move-exception v68
3338
3339      move-object/from16 v79, v80
3340
3341 -    goto/16 :goto_8f6
3342 +    goto/16 :goto_8fb
3343
3344 -    :catch_a78
3345 +    :catch_a7d
3346      move-exception v68
3347
3348      move-object/from16 v90, v91
3349
3350 -    goto/16 :goto_8de
3351 +    goto/16 :goto_8e3
3352
3353 -    :catch_a7d
3354 +    :catch_a82
3355      move-exception v68
3356
3357      move-object/from16 v95, v96
3358
3359 -    goto/16 :goto_8ba
3360 +    goto/16 :goto_8bf
3361
3362 -    :catch_a82
3363 +    :catch_a87
3364      move-exception v68
3365
3366      move-object/from16 v109, v110
3367
3368 -    goto/16 :goto_8a2
3369 +    goto/16 :goto_8a7
3370
3371 -    :catch_a87
3372 +    :catch_a8c
3373      move-exception v68
3374
3375      move-object/from16 v56, v57
3376
3377 -    goto/16 :goto_88a
3378 +    goto/16 :goto_88f
3379
3380 -    :catch_a8c
3381 +    :catch_a91
3382      move-exception v68
3383
3384      move-object/from16 v122, v123
3385
3386 -    goto/16 :goto_87e
3387 +    goto/16 :goto_883
3388
3389 -    :catch_a91
3390 +    :catch_a96
3391      move-exception v68
3392
3393      move-object/from16 v124, v125
3394
3395 -    goto/16 :goto_872
3396 +    goto/16 :goto_877
3397
3398 -    :catch_a96
3399 +    :catch_a9b
3400      move-exception v68
3401
3402 -    goto/16 :goto_866
3403 +    goto/16 :goto_86b
3404
3405 -    :catch_a99
3406 +    :catch_a9e
3407      move-exception v68
3408
3409      move-object/from16 v12, v87
3410
3411 -    goto/16 :goto_858
3412 +    goto/16 :goto_85d
3413
3414 -    :catch_a9e
3415 +    :catch_aa3
3416      move-exception v68
3417
3418      move-object/from16 v111, v112
3419
3420 -    goto/16 :goto_84c
3421 +    goto/16 :goto_851
3422
3423 -    :catch_aa3
3424 +    :catch_aa8
3425      move-exception v68
3426
3427      move-object/from16 v107, v108
3428
3429 -    goto/16 :goto_828
3430 +    goto/16 :goto_82d
3431
3432 -    :catch_aa8
3433 +    :catch_aad
3434      move-exception v68
3435
3436      move-object/from16 v62, v63
3437
3438 -    goto/16 :goto_81c
3439 +    goto/16 :goto_821
3440
3441 -    :catch_aad
3442 +    :catch_ab2
3443      move-exception v68
3444
3445      move-object/from16 v81, v82
3446
3447 -    goto/16 :goto_810
3448 +    goto/16 :goto_815
3449
3450 -    :catch_ab2
3451 +    :catch_ab7
3452      move-exception v68
3453
3454      move-object/from16 v84, v85
3455
3456 -    goto/16 :goto_804
3457 +    goto/16 :goto_809
3458
3459 -    :catch_ab7
3460 +    :catch_abc
3461      move-exception v3
3462
3463 -    goto/16 :goto_27d
3464 +    goto/16 :goto_282
3465
3466 -    :catch_aba
3467 +    :catch_abf
3468      move-exception v68
3469
3470      move-object/from16 v74, v75
3471
3472 -    goto/16 :goto_7d4
3473 +    goto/16 :goto_7d9
3474
3475 -    :catch_abf
3476 +    :catch_ac4
3477      move-exception v68
3478
3479      move-object/from16 v7, v44
3480 @@ -3183,9 +3222,9 @@
3481
3482      move-object/from16 v6, v94
3483
3484 -    goto/16 :goto_754
3485 +    goto/16 :goto_759
3486
3487 -    :catch_ac8
3488 +    :catch_acd
3489      move-exception v68
3490
3491      move-object/from16 v7, v44
3492 @@ -3194,9 +3233,9 @@
3493
3494      move-object/from16 v42, v43
3495
3496 -    goto/16 :goto_754
3497 +    goto/16 :goto_759
3498
3499 -    :catch_ad1
3500 +    :catch_ad6
3501      move-exception v68
3502
3503      move-object/from16 v7, v44
3504 @@ -3205,18 +3244,18 @@
3505
3506      move-object/from16 v77, v78
3507
3508 -    goto/16 :goto_754
3509 +    goto/16 :goto_759
3510
3511 -    :catch_ada
3512 +    :catch_adf
3513      move-exception v68
3514
3515      move-object/from16 v7, v44
3516
3517      move-object/from16 v77, v78
3518
3519 -    goto/16 :goto_754
3520 +    goto/16 :goto_759
3521
3522 -    :catch_ae1
3523 +    :catch_ae6
3524      move-exception v68
3525
3526      move-object/from16 v7, v44
3527 @@ -3225,9 +3264,9 @@
3528
3529      move-object/from16 v77, v78
3530
3531 -    goto/16 :goto_754
3532 +    goto/16 :goto_759
3533
3534 -    :catch_aea
3535 +    :catch_aef
3536      move-exception v68
3537
3538      move-object/from16 v48, v49
3539 @@ -3236,9 +3275,9 @@
3540
3541      move-object/from16 v77, v78
3542
3543 -    goto/16 :goto_754
3544 +    goto/16 :goto_759
3545
3546 -    :catch_af3
3547 +    :catch_af8
3548      move-exception v68
3549
3550      move-object/from16 v50, v51
3551 @@ -3249,17 +3288,17 @@
3552
3553      move-object/from16 v77, v78
3554
3555 -    goto/16 :goto_754
3556 +    goto/16 :goto_759
3557
3558 -    :catch_afe
3559 +    :catch_b03
3560      move-exception v68
3561
3562      move-object/from16 v42, v43
3563
3564 -    goto/16 :goto_744
3565 +    goto/16 :goto_749
3566
3567 -    :cond_b03
3568 +    :cond_b08
3569      move-object/from16 v8, v86
3570
3571 -    goto/16 :goto_606
3572 +    goto/16 :goto_60b
3573  .end method