patches/pdroid/jellybean/aosp-jb/20120809/services.patch

   1 diff -Npru stock-services/smali/com/android/server/am/ActivityManagerService.smali pdroid-services/smali/com/android/server/am/ActivityManagerService.smali
   2 --- stock-services/smali/com/android/server/am/ActivityManagerService.smali     2012-08-08 09:27:23.377629162 -0500
   3 +++ pdroid-services/smali/com/android/server/am/ActivityManagerService.smali    2012-08-08 09:27:39.369708471 -0500
   4 @@ -41191,7 +41191,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 @@ -41219,40 +41219,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 @@ -59015,7 +59021,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 @@ -59030,11 +59036,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 @@ -59058,20 +59064,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 @@ -59079,12 +59091,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 @@ -59100,37 +59112,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 stock-services/smali/com/android/server/am/BroadcastQueue.smali pdroid-services/smali/com/android/server/am/BroadcastQueue.smali
 196 --- stock-services/smali/com/android/server/am/BroadcastQueue.smali     2012-08-08 09:27:23.477629658 -0500
 197 +++ pdroid-services/smali/com/android/server/am/BroadcastQueue.smali    2012-08-08 09:27:39.473708980 -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 stock-services/smali/com/android/server/ServerThread.smali pdroid-services/smali/com/android/server/ServerThread.smali
 789 --- stock-services/smali/com/android/server/ServerThread.smali  2012-08-08 09:27:22.477624698 -0500
 790 +++ pdroid-services/smali/com/android/server/ServerThread.smali 2012-08-08 09:27:38.573704518 -0500
 791 @@ -24,6 +24,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 @@ -155,7 +190,7 @@
 834
 835      const/16 v9, 0x31
 836
 837 -    if-ne v3, v9, :cond_65a
 838 +    if-ne v3, v9, :cond_65f
 839
 840      const/16 v90, 0x1
 841
 842 @@ -166,7 +201,7 @@
 843
 844      const/4 v9, 0x1
 845
 846 -    if-le v3, v9, :cond_65e
 847 +    if-le v3, v9, :cond_663
 848
 849      const/4 v3, 0x1
 850
 851 @@ -202,7 +237,7 @@
 852
 853      move-result v3
 854
 855 -    if-eqz v3, :cond_662
 856 +    if-eqz v3, :cond_667
 857
 858      const/16 v65, 0x0
 859
 860 @@ -298,7 +333,7 @@
 861
 862      invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
 863      :try_end_bc
 864 -    .catch Ljava/lang/RuntimeException; {:try_start_9f .. :try_end_bc} :catch_9ba
 865 +    .catch Ljava/lang/RuntimeException; {:try_start_9f .. :try_end_bc} :catch_9bf
 866
 867      :try_start_bc
 868      const-string v3, "power"
 869 @@ -367,7 +402,7 @@
 870
 871      move-result v3
 872
 873 -    if-eqz v3, :cond_668
 874 +    if-eqz v3, :cond_66d
 875
 876      const-string v3, "SystemServer"
 877
 878 @@ -379,7 +414,7 @@
 879
 880      :cond_113
 881      :goto_113
 882 -    if-eqz v65, :cond_67d
 883 +    if-eqz v65, :cond_682
 884
 885      const/4 v3, 0x1
 886
 887 @@ -388,7 +423,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_11b
 891 -    .catch Ljava/lang/RuntimeException; {:try_start_bc .. :try_end_11b} :catch_68c
 892 +    .catch Ljava/lang/RuntimeException; {:try_start_bc .. :try_end_11b} :catch_691
 893
 894      move-result-object v87
 895
 896 @@ -397,8 +432,8 @@
 897      :try_start_11e
 898      invoke-interface/range {v87 .. v87}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
 899      :try_end_121
 900 -    .catch Landroid/os/RemoteException; {:try_start_11e .. :try_end_121} :catch_94f
 901 -    .catch Ljava/lang/RuntimeException; {:try_start_11e .. :try_end_121} :catch_68c
 902 +    .catch Landroid/os/RemoteException; {:try_start_11e .. :try_end_121} :catch_954
 903 +    .catch Ljava/lang/RuntimeException; {:try_start_11e .. :try_end_121} :catch_691
 904
 905      move-result v67
 906
 907 @@ -414,7 +449,7 @@
 908
 909      iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
 910      :try_end_12d
 911 -    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_12d} :catch_68c
 912 +    .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_12d} :catch_691
 913
 914      :try_start_12d
 915      const-string v3, "SystemServer"
 916 @@ -431,8 +466,8 @@
 917
 918      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 919      :try_end_13e
 920 -    .catch Ljava/lang/Throwable; {:try_start_12d .. :try_end_13e} :catch_680
 921 -    .catch Ljava/lang/RuntimeException; {:try_start_12d .. :try_end_13e} :catch_68c
 922 +    .catch Ljava/lang/Throwable; {:try_start_12d .. :try_end_13e} :catch_685
 923 +    .catch Ljava/lang/RuntimeException; {:try_start_12d .. :try_end_13e} :catch_691
 924
 925      :goto_13e
 926      :try_start_13e
 927 @@ -446,13 +481,17 @@
 928
 929      move/from16 v0, v65
 930
 931 -    if-ne v0, v3, :cond_6a3
 932 +    if-ne v0, v3, :cond_6a8
 933
 934      const/4 v3, 0x1
 935
 936      :goto_14b
 937      invoke-static {v4, v3}, Landroid/content/ContentService;->main(Landroid/content/Context;Z)Landroid/content/IContentService;
 938
 939 +    move-object/from16 v0, p0
 940 +
 941 +    invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
 942 +
 943      const-string v3, "SystemServer"
 944
 945      const-string v9, "System Content Providers"
 946 @@ -472,10 +511,10 @@
 947      move-object/from16 v0, v72
 948
 949      invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
 950 -    :try_end_166
 951 -    .catch Ljava/lang/RuntimeException; {:try_start_13e .. :try_end_166} :catch_68c
 952 +    :try_end_16b
 953 +    .catch Ljava/lang/RuntimeException; {:try_start_13e .. :try_end_16b} :catch_691
 954
 955 -    :try_start_166
 956 +    :try_start_16b
 957      const-string v3, "SystemServer"
 958
 959      const-string v9, "Battery Service"
 960 @@ -487,10 +526,10 @@
 961      move-object/from16 v0, v72
 962
 963      invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
 964 -    :try_end_174
 965 -    .catch Ljava/lang/RuntimeException; {:try_start_166 .. :try_end_174} :catch_9c3
 966 +    :try_end_179
 967 +    .catch Ljava/lang/RuntimeException; {:try_start_16b .. :try_end_179} :catch_9c8
 968
 969 -    :try_start_174
 970 +    :try_start_179
 971      const-string v3, "battery"
 972
 973      invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
 974 @@ -506,10 +545,10 @@
 975      move-object/from16 v0, v108
 976
 977      invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
 978 -    :try_end_187
 979 -    .catch Ljava/lang/RuntimeException; {:try_start_174 .. :try_end_187} :catch_9cc
 980 +    :try_end_18c
 981 +    .catch Ljava/lang/RuntimeException; {:try_start_179 .. :try_end_18c} :catch_9d1
 982
 983 -    :try_start_187
 984 +    :try_start_18c
 985      const-string v3, "vibrator"
 986
 987      move-object/from16 v0, v108
 988 @@ -533,10 +572,10 @@
 989      new-instance v7, Lcom/android/server/AlarmManagerService;
 990
 991      invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
 992 -    :try_end_1a3
 993 -    .catch Ljava/lang/RuntimeException; {:try_start_187 .. :try_end_1a3} :catch_9d3
 994 +    :try_end_1a8
 995 +    .catch Ljava/lang/RuntimeException; {:try_start_18c .. :try_end_1a8} :catch_9d8
 996
 997 -    :try_start_1a3
 998 +    :try_start_1a8
 999      const-string v3, "alarm"
1000
1001      invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1002 @@ -567,18 +606,18 @@
1003
1004      move/from16 v0, v65
1005
1006 -    if-eq v0, v3, :cond_6a6
1007 +    if-eq v0, v3, :cond_6ab
1008
1009      const/4 v3, 0x1
1010
1011      move v9, v3
1012
1013 -    :goto_1c8
1014 -    if-nez v67, :cond_6aa
1015 +    :goto_1cd
1016 +    if-nez v67, :cond_6af
1017
1018      const/4 v3, 0x1
1019
1020 -    :goto_1cb
1021 +    :goto_1d0
1022      move/from16 v0, v86
1023
1024      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;
1025 @@ -621,22 +660,22 @@
1026
1027      move-result v3
1028
1029 -    if-eqz v3, :cond_6ad
1030 +    if-eqz v3, :cond_6b2
1031
1032      const-string v3, "SystemServer"
1033
1034      const-string v9, "No Bluetooh Service (emulator)"
1035
1036      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1037 -    :try_end_201
1038 -    .catch Ljava/lang/RuntimeException; {:try_start_1a3 .. :try_end_201} :catch_6bb
1039 +    :try_end_206
1040 +    .catch Ljava/lang/RuntimeException; {:try_start_1a8 .. :try_end_206} :catch_6c0
1041
1042 -    :goto_201
1043 +    :goto_206
1044      move-object/from16 v107, v108
1045
1046      move-object/from16 v71, v72
1047
1048 -    :goto_205
1049 +    :goto_20a
1050      const/16 v58, 0x0
1051
1052      const/16 v97, 0x0
1053 @@ -663,9 +702,9 @@
1054
1055      move/from16 v0, v65
1056
1057 -    if-eq v0, v3, :cond_24a
1058 +    if-eq v0, v3, :cond_24f
1059
1060 -    :try_start_220
1061 +    :try_start_225
1062      const-string v3, "SystemServer"
1063
1064      const-string v9, "Input Method Service"
1065 @@ -679,22 +718,22 @@
1066      move-object/from16 v1, v116
1067
1068      invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
1069 -    :try_end_230
1070 -    .catch Ljava/lang/Throwable; {:try_start_220 .. :try_end_230} :catch_710
1071 +    :try_end_235
1072 +    .catch Ljava/lang/Throwable; {:try_start_225 .. :try_end_235} :catch_715
1073
1074 -    :try_start_230
1075 +    :try_start_235
1076      const-string v3, "input_method"
1077
1078      move-object/from16 v0, v69
1079
1080      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1081 -    :try_end_237
1082 -    .catch Ljava/lang/Throwable; {:try_start_230 .. :try_end_237} :catch_9b5
1083 +    :try_end_23c
1084 +    .catch Ljava/lang/Throwable; {:try_start_235 .. :try_end_23c} :catch_9ba
1085
1086      move-object/from16 v68, v69
1087
1088 -    :goto_239
1089 -    :try_start_239
1090 +    :goto_23e
1091 +    :try_start_23e
1092      const-string v3, "SystemServer"
1093
1094      const-string v9, "Accessibility Manager"
1095 @@ -708,24 +747,24 @@
1096      invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
1097
1098      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1099 -    :try_end_24a
1100 -    .catch Ljava/lang/Throwable; {:try_start_239 .. :try_end_24a} :catch_71c
1101 +    :try_end_24f
1102 +    .catch Ljava/lang/Throwable; {:try_start_23e .. :try_end_24f} :catch_721
1103
1104 -    :cond_24a
1105 -    :goto_24a
1106 -    :try_start_24a
1107 +    :cond_24f
1108 +    :goto_24f
1109 +    :try_start_24f
1110      invoke-virtual/range {v116 .. v116}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
1111 -    :try_end_24d
1112 -    .catch Ljava/lang/Throwable; {:try_start_24a .. :try_end_24d} :catch_728
1113 +    :try_end_252
1114 +    .catch Ljava/lang/Throwable; {:try_start_24f .. :try_end_252} :catch_72d
1115
1116 -    :goto_24d
1117 -    :try_start_24d
1118 +    :goto_252
1119 +    :try_start_252
1120      invoke-interface/range {v87 .. v87}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
1121 -    :try_end_250
1122 -    .catch Ljava/lang/Throwable; {:try_start_24d .. :try_end_250} :catch_734
1123 +    :try_end_255
1124 +    .catch Ljava/lang/Throwable; {:try_start_252 .. :try_end_255} :catch_739
1125
1126 -    :goto_250
1127 -    :try_start_250
1128 +    :goto_255
1129 +    :try_start_255
1130      invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
1131
1132      move-result-object v3
1133 @@ -743,15 +782,15 @@
1134      const/4 v10, 0x0
1135
1136      invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
1137 -    :try_end_263
1138 -    .catch Landroid/os/RemoteException; {:try_start_250 .. :try_end_263} :catch_9b2
1139 +    :try_end_268
1140 +    .catch Landroid/os/RemoteException; {:try_start_255 .. :try_end_268} :catch_9b7
1141
1142 -    :goto_263
1143 +    :goto_268
1144      const/4 v3, 0x1
1145
1146      move/from16 v0, v65
1147
1148 -    if-eq v0, v3, :cond_9f0
1149 +    if-eq v0, v3, :cond_9f5
1150
1151      const/16 v78, 0x0
1152
1153 @@ -767,9 +806,9 @@
1154
1155      move-result v3
1156
1157 -    if-nez v3, :cond_28f
1158 +    if-nez v3, :cond_294
1159
1160 -    :try_start_278
1161 +    :try_start_27d
1162      const-string v3, "SystemServer"
1163
1164      const-string v9, "Mount Service"
1165 @@ -781,23 +820,23 @@
1166      move-object/from16 v0, v79
1167
1168      invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
1169 -    :try_end_286
1170 -    .catch Ljava/lang/Throwable; {:try_start_278 .. :try_end_286} :catch_740
1171 +    :try_end_28b
1172 +    .catch Ljava/lang/Throwable; {:try_start_27d .. :try_end_28b} :catch_745
1173
1174 -    :try_start_286
1175 +    :try_start_28b
1176      const-string v3, "mount"
1177
1178      move-object/from16 v0, v79
1179
1180      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1181 -    :try_end_28d
1182 -    .catch Ljava/lang/Throwable; {:try_start_286 .. :try_end_28d} :catch_9ad
1183 +    :try_end_292
1184 +    .catch Ljava/lang/Throwable; {:try_start_28b .. :try_end_292} :catch_9b2
1185
1186      move-object/from16 v78, v79
1187
1188 -    :cond_28f
1189 -    :goto_28f
1190 -    :try_start_28f
1191 +    :cond_294
1192 +    :goto_294
1193 +    :try_start_294
1194      const-string v3, "SystemServer"
1195
1196      const-string v9, "LockSettingsService"
1197 @@ -809,22 +848,22 @@
1198      move-object/from16 v0, v76
1199
1200      invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
1201 -    :try_end_29d
1202 -    .catch Ljava/lang/Throwable; {:try_start_28f .. :try_end_29d} :catch_74c
1203 +    :try_end_2a2
1204 +    .catch Ljava/lang/Throwable; {:try_start_294 .. :try_end_2a2} :catch_751
1205
1206 -    :try_start_29d
1207 +    :try_start_2a2
1208      const-string v3, "lock_settings"
1209
1210      move-object/from16 v0, v76
1211
1212      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1213 -    :try_end_2a4
1214 -    .catch Ljava/lang/Throwable; {:try_start_29d .. :try_end_2a4} :catch_9a8
1215 +    :try_end_2a9
1216 +    .catch Ljava/lang/Throwable; {:try_start_2a2 .. :try_end_2a9} :catch_9ad
1217
1218      move-object/from16 v75, v76
1219
1220 -    :goto_2a6
1221 -    :try_start_2a6
1222 +    :goto_2ab
1223 +    :try_start_2ab
1224      const-string v3, "SystemServer"
1225
1226      const-string v9, "Device Policy"
1227 @@ -836,22 +875,22 @@
1228      move-object/from16 v0, v59
1229
1230      invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
1231 -    :try_end_2b4
1232 -    .catch Ljava/lang/Throwable; {:try_start_2a6 .. :try_end_2b4} :catch_758
1233 +    :try_end_2b9
1234 +    .catch Ljava/lang/Throwable; {:try_start_2ab .. :try_end_2b9} :catch_75d
1235
1236 -    :try_start_2b4
1237 +    :try_start_2b9
1238      const-string v3, "device_policy"
1239
1240      move-object/from16 v0, v59
1241
1242      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1243 -    :try_end_2bb
1244 -    .catch Ljava/lang/Throwable; {:try_start_2b4 .. :try_end_2bb} :catch_9a3
1245 +    :try_end_2c0
1246 +    .catch Ljava/lang/Throwable; {:try_start_2b9 .. :try_end_2c0} :catch_9a8
1247
1248      move-object/from16 v58, v59
1249
1250 -    :goto_2bd
1251 -    :try_start_2bd
1252 +    :goto_2c2
1253 +    :try_start_2c2
1254      const-string v3, "SystemServer"
1255
1256      const-string v9, "Status Bar"
1257 @@ -865,22 +904,22 @@
1258      move-object/from16 v1, v116
1259
1260      invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
1261 -    :try_end_2cd
1262 -    .catch Ljava/lang/Throwable; {:try_start_2bd .. :try_end_2cd} :catch_764
1263 +    :try_end_2d2
1264 +    .catch Ljava/lang/Throwable; {:try_start_2c2 .. :try_end_2d2} :catch_769
1265
1266 -    :try_start_2cd
1267 +    :try_start_2d2
1268      const-string v3, "statusbar"
1269
1270      move-object/from16 v0, v98
1271
1272      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1273 -    :try_end_2d4
1274 -    .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2d4} :catch_99e
1275 +    :try_end_2d9
1276 +    .catch Ljava/lang/Throwable; {:try_start_2d2 .. :try_end_2d9} :catch_9a3
1277
1278      move-object/from16 v97, v98
1279
1280 -    :goto_2d6
1281 -    :try_start_2d6
1282 +    :goto_2db
1283 +    :try_start_2db
1284      const-string v3, "SystemServer"
1285
1286      const-string v9, "Clipboard Service"
1287 @@ -894,11 +933,11 @@
1288      invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
1289
1290      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1291 -    :try_end_2e7
1292 -    .catch Ljava/lang/Throwable; {:try_start_2d6 .. :try_end_2e7} :catch_770
1293 +    :try_end_2ec
1294 +    .catch Ljava/lang/Throwable; {:try_start_2db .. :try_end_2ec} :catch_775
1295
1296 -    :goto_2e7
1297 -    :try_start_2e7
1298 +    :goto_2ec
1299 +    :try_start_2ec
1300      const-string v3, "SystemServer"
1301
1302      const-string v9, "NetworkManagement Service"
1303 @@ -912,11 +951,11 @@
1304      const-string v3, "network_management"
1305
1306      invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1307 -    :try_end_2f7
1308 -    .catch Ljava/lang/Throwable; {:try_start_2e7 .. :try_end_2f7} :catch_77c
1309 +    :try_end_2fc
1310 +    .catch Ljava/lang/Throwable; {:try_start_2ec .. :try_end_2fc} :catch_781
1311
1312 -    :goto_2f7
1313 -    :try_start_2f7
1314 +    :goto_2fc
1315 +    :try_start_2fc
1316      const-string v3, "SystemServer"
1317
1318      const-string v9, "Text Service Manager Service"
1319 @@ -928,22 +967,22 @@
1320      move-object/from16 v0, v102
1321
1322      invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
1323 -    :try_end_305
1324 -    .catch Ljava/lang/Throwable; {:try_start_2f7 .. :try_end_305} :catch_788
1325 +    :try_end_30a
1326 +    .catch Ljava/lang/Throwable; {:try_start_2fc .. :try_end_30a} :catch_78d
1327
1328 -    :try_start_305
1329 +    :try_start_30a
1330      const-string v3, "textservices"
1331
1332      move-object/from16 v0, v102
1333
1334      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1335 -    :try_end_30c
1336 -    .catch Ljava/lang/Throwable; {:try_start_305 .. :try_end_30c} :catch_999
1337 +    :try_end_311
1338 +    .catch Ljava/lang/Throwable; {:try_start_30a .. :try_end_311} :catch_99e
1339
1340      move-object/from16 v101, v102
1341
1342 -    :goto_30e
1343 -    :try_start_30e
1344 +    :goto_313
1345 +    :try_start_313
1346      const-string v3, "SystemServer"
1347
1348      const-string v9, "NetworkStats Service"
1349 @@ -955,22 +994,22 @@
1350      move-object/from16 v0, v81
1351
1352      invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
1353 -    :try_end_31c
1354 -    .catch Ljava/lang/Throwable; {:try_start_30e .. :try_end_31c} :catch_794
1355 +    :try_end_321
1356 +    .catch Ljava/lang/Throwable; {:try_start_313 .. :try_end_321} :catch_799
1357
1358 -    :try_start_31c
1359 +    :try_start_321
1360      const-string v3, "netstats"
1361
1362      move-object/from16 v0, v81
1363
1364      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1365 -    :try_end_323
1366 -    .catch Ljava/lang/Throwable; {:try_start_31c .. :try_end_323} :catch_994
1367 +    :try_end_328
1368 +    .catch Ljava/lang/Throwable; {:try_start_321 .. :try_end_328} :catch_999
1369
1370      move-object/from16 v12, v81
1371
1372 -    :goto_325
1373 -    :try_start_325
1374 +    :goto_32a
1375 +    :try_start_32a
1376      const-string v3, "SystemServer"
1377
1378      const-string v9, "NetworkPolicy Service"
1379 @@ -988,18 +1027,18 @@
1380      move-object v11, v6
1381
1382      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
1383 -    :try_end_337
1384 -    .catch Ljava/lang/Throwable; {:try_start_325 .. :try_end_337} :catch_7a0
1385 +    :try_end_33c
1386 +    .catch Ljava/lang/Throwable; {:try_start_32a .. :try_end_33c} :catch_7a5
1387
1388 -    :try_start_337
1389 +    :try_start_33c
1390      const-string v3, "netpolicy"
1391
1392      invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1393 -    :try_end_33c
1394 -    .catch Ljava/lang/Throwable; {:try_start_337 .. :try_end_33c} :catch_991
1395 +    :try_end_341
1396 +    .catch Ljava/lang/Throwable; {:try_start_33c .. :try_end_341} :catch_996
1397
1398 -    :goto_33c
1399 -    :try_start_33c
1400 +    :goto_341
1401 +    :try_start_341
1402      const-string v3, "SystemServer"
1403
1404      const-string v9, "Wi-Fi P2pService"
1405 @@ -1011,22 +1050,22 @@
1406      move-object/from16 v0, v115
1407
1408      invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
1409 -    :try_end_34a
1410 -    .catch Ljava/lang/Throwable; {:try_start_33c .. :try_end_34a} :catch_7ae
1411 +    :try_end_34f
1412 +    .catch Ljava/lang/Throwable; {:try_start_341 .. :try_end_34f} :catch_7b3
1413
1414 -    :try_start_34a
1415 +    :try_start_34f
1416      const-string v3, "wifip2p"
1417
1418      move-object/from16 v0, v115
1419
1420      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1421 -    :try_end_351
1422 -    .catch Ljava/lang/Throwable; {:try_start_34a .. :try_end_351} :catch_98c
1423 +    :try_end_356
1424 +    .catch Ljava/lang/Throwable; {:try_start_34f .. :try_end_356} :catch_991
1425
1426      move-object/from16 v114, v115
1427
1428 -    :goto_353
1429 -    :try_start_353
1430 +    :goto_358
1431 +    :try_start_358
1432      const-string v3, "SystemServer"
1433
1434      const-string v9, "Wi-Fi Service"
1435 @@ -1038,22 +1077,22 @@
1436      move-object/from16 v0, v113
1437
1438      invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
1439 -    :try_end_361
1440 -    .catch Ljava/lang/Throwable; {:try_start_353 .. :try_end_361} :catch_7ba
1441 +    :try_end_366
1442 +    .catch Ljava/lang/Throwable; {:try_start_358 .. :try_end_366} :catch_7bf
1443
1444 -    :try_start_361
1445 +    :try_start_366
1446      const-string v3, "wifi"
1447
1448      move-object/from16 v0, v113
1449
1450      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1451 -    :try_end_368
1452 -    .catch Ljava/lang/Throwable; {:try_start_361 .. :try_end_368} :catch_987
1453 +    :try_end_36d
1454 +    .catch Ljava/lang/Throwable; {:try_start_366 .. :try_end_36d} :catch_98c
1455
1456      move-object/from16 v112, v113
1457
1458 -    :goto_36a
1459 -    :try_start_36a
1460 +    :goto_36f
1461 +    :try_start_36f
1462      const-string v3, "SystemServer"
1463
1464      const-string v9, "Connectivity Service"
1465 @@ -1065,10 +1104,10 @@
1466      move-object/from16 v0, v54
1467
1468      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
1469 -    :try_end_378
1470 -    .catch Ljava/lang/Throwable; {:try_start_36a .. :try_end_378} :catch_7c6
1471 +    :try_end_37d
1472 +    .catch Ljava/lang/Throwable; {:try_start_36f .. :try_end_37d} :catch_7cb
1473
1474 -    :try_start_378
1475 +    :try_start_37d
1476      const-string v3, "connectivity"
1477
1478      move-object/from16 v0, v54
1479 @@ -1086,13 +1125,13 @@
1480      invoke-virtual/range {v112 .. v112}, Lcom/android/server/WifiService;->checkAndStartWifi()V
1481
1482      invoke-virtual/range {v114 .. v114}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
1483 -    :try_end_38f
1484 -    .catch Ljava/lang/Throwable; {:try_start_378 .. :try_end_38f} :catch_982
1485 +    :try_end_394
1486 +    .catch Ljava/lang/Throwable; {:try_start_37d .. :try_end_394} :catch_987
1487
1488      move-object/from16 v53, v54
1489
1490 -    :goto_391
1491 -    :try_start_391
1492 +    :goto_396
1493 +    :try_start_396
1494      const-string v3, "SystemServer"
1495
1496      const-string v9, "Network Service Discovery Service"
1497 @@ -1108,11 +1147,11 @@
1498      move-object/from16 v0, v95
1499
1500      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1501 -    :try_end_3a3
1502 -    .catch Ljava/lang/Throwable; {:try_start_391 .. :try_end_3a3} :catch_7d2
1503 +    :try_end_3a8
1504 +    .catch Ljava/lang/Throwable; {:try_start_396 .. :try_end_3a8} :catch_7d7
1505
1506 -    :goto_3a3
1507 -    :try_start_3a3
1508 +    :goto_3a8
1509 +    :try_start_3a8
1510      const-string v3, "SystemServer"
1511
1512      const-string v9, "Throttle Service"
1513 @@ -1124,22 +1163,22 @@
1514      move-object/from16 v0, v100
1515
1516      invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
1517 -    :try_end_3b1
1518 -    .catch Ljava/lang/Throwable; {:try_start_3a3 .. :try_end_3b1} :catch_7de
1519 +    :try_end_3b6
1520 +    .catch Ljava/lang/Throwable; {:try_start_3a8 .. :try_end_3b6} :catch_7e3
1521
1522 -    :try_start_3b1
1523 +    :try_start_3b6
1524      const-string v3, "throttle"
1525
1526      move-object/from16 v0, v100
1527
1528      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1529 -    :try_end_3b8
1530 -    .catch Ljava/lang/Throwable; {:try_start_3b1 .. :try_end_3b8} :catch_97d
1531 +    :try_end_3bd
1532 +    .catch Ljava/lang/Throwable; {:try_start_3b6 .. :try_end_3bd} :catch_982
1533
1534      move-object/from16 v99, v100
1535
1536 -    :goto_3ba
1537 -    :try_start_3ba
1538 +    :goto_3bf
1539 +    :try_start_3bf
1540      const-string v3, "SystemServer"
1541
1542      const-string v9, "UpdateLock Service"
1543 @@ -1153,16 +1192,16 @@
1544      invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
1545
1546      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1547 -    :try_end_3cb
1548 -    .catch Ljava/lang/Throwable; {:try_start_3ba .. :try_end_3cb} :catch_7ea
1549 +    :try_end_3d0
1550 +    .catch Ljava/lang/Throwable; {:try_start_3bf .. :try_end_3d0} :catch_7ef
1551
1552 -    :goto_3cb
1553 -    if-eqz v78, :cond_3d0
1554 +    :goto_3d0
1555 +    if-eqz v78, :cond_3d5
1556
1557      invoke-virtual/range {v78 .. v78}, Lcom/android/server/MountService;->waitForAsecScan()V
1558
1559 -    :cond_3d0
1560 -    :try_start_3d0
1561 +    :cond_3d5
1562 +    :try_start_3d5
1563      const-string v3, "SystemServer"
1564
1565      const-string v9, "Notification Manager"
1566 @@ -1178,10 +1217,10 @@
1567      move-object/from16 v2, v71
1568
1569      invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
1570 -    :try_end_3e2
1571 -    .catch Ljava/lang/Throwable; {:try_start_3d0 .. :try_end_3e2} :catch_7f6
1572 +    :try_end_3e7
1573 +    .catch Ljava/lang/Throwable; {:try_start_3d5 .. :try_end_3e7} :catch_7fb
1574
1575 -    :try_start_3e2
1576 +    :try_start_3e7
1577      const-string v3, "notification"
1578
1579      move-object/from16 v0, v85
1580 @@ -1191,13 +1230,13 @@
1581      move-object/from16 v0, v85
1582
1583      invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
1584 -    :try_end_3ee
1585 -    .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3ee} :catch_978
1586 +    :try_end_3f3
1587 +    .catch Ljava/lang/Throwable; {:try_start_3e7 .. :try_end_3f3} :catch_97d
1588
1589      move-object/from16 v84, v85
1590
1591 -    :goto_3f0
1592 -    :try_start_3f0
1593 +    :goto_3f5
1594 +    :try_start_3f5
1595      const-string v3, "SystemServer"
1596
1597      const-string v9, "Device Storage Monitor"
1598 @@ -1211,11 +1250,11 @@
1599      invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
1600
1601      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1602 -    :try_end_401
1603 -    .catch Ljava/lang/Throwable; {:try_start_3f0 .. :try_end_401} :catch_802
1604 +    :try_end_406
1605 +    .catch Ljava/lang/Throwable; {:try_start_3f5 .. :try_end_406} :catch_807
1606
1607 -    :goto_401
1608 -    :try_start_401
1609 +    :goto_406
1610 +    :try_start_406
1611      const-string v3, "SystemServer"
1612
1613      const-string v9, "Location Manager"
1614 @@ -1227,22 +1266,22 @@
1615      move-object/from16 v0, v74
1616
1617      invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
1618 -    :try_end_40f
1619 -    .catch Ljava/lang/Throwable; {:try_start_401 .. :try_end_40f} :catch_80e
1620 +    :try_end_414
1621 +    .catch Ljava/lang/Throwable; {:try_start_406 .. :try_end_414} :catch_813
1622
1623 -    :try_start_40f
1624 +    :try_start_414
1625      const-string v3, "location"
1626
1627      move-object/from16 v0, v74
1628
1629      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1630 -    :try_end_416
1631 -    .catch Ljava/lang/Throwable; {:try_start_40f .. :try_end_416} :catch_973
1632 +    :try_end_41b
1633 +    .catch Ljava/lang/Throwable; {:try_start_414 .. :try_end_41b} :catch_978
1634
1635      move-object/from16 v73, v74
1636
1637 -    :goto_418
1638 -    :try_start_418
1639 +    :goto_41d
1640 +    :try_start_41d
1641      const-string v3, "SystemServer"
1642
1643      const-string v9, "Country Detector"
1644 @@ -1254,22 +1293,22 @@
1645      move-object/from16 v0, v56
1646
1647      invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
1648 -    :try_end_426
1649 -    .catch Ljava/lang/Throwable; {:try_start_418 .. :try_end_426} :catch_81a
1650 +    :try_end_42b
1651 +    .catch Ljava/lang/Throwable; {:try_start_41d .. :try_end_42b} :catch_81f
1652
1653 -    :try_start_426
1654 +    :try_start_42b
1655      const-string v3, "country_detector"
1656
1657      move-object/from16 v0, v56
1658
1659      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1660 -    :try_end_42d
1661 -    .catch Ljava/lang/Throwable; {:try_start_426 .. :try_end_42d} :catch_96e
1662 +    :try_end_432
1663 +    .catch Ljava/lang/Throwable; {:try_start_42b .. :try_end_432} :catch_973
1664
1665      move-object/from16 v55, v56
1666
1667 -    :goto_42f
1668 -    :try_start_42f
1669 +    :goto_434
1670 +    :try_start_434
1671      const-string v3, "SystemServer"
1672
1673      const-string v9, "Search Service"
1674 @@ -1283,11 +1322,11 @@
1675      invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
1676
1677      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1678 -    :try_end_440
1679 -    .catch Ljava/lang/Throwable; {:try_start_42f .. :try_end_440} :catch_826
1680 +    :try_end_445
1681 +    .catch Ljava/lang/Throwable; {:try_start_434 .. :try_end_445} :catch_82b
1682
1683 -    :goto_440
1684 -    :try_start_440
1685 +    :goto_445
1686 +    :try_start_445
1687      const-string v3, "SystemServer"
1688
1689      const-string v9, "DropBox Service"
1690 @@ -1307,10 +1346,10 @@
1691      invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
1692
1693      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1694 -    :try_end_458
1695 -    .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_458} :catch_832
1696 +    :try_end_45d
1697 +    .catch Ljava/lang/Throwable; {:try_start_445 .. :try_end_45d} :catch_837
1698
1699 -    :goto_458
1700 +    :goto_45d
1701      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
1702
1703      move-result-object v3
1704 @@ -1321,38 +1360,38 @@
1705
1706      move-result v3
1707
1708 -    if-eqz v3, :cond_47e
1709 +    if-eqz v3, :cond_483
1710
1711 -    :try_start_465
1712 +    :try_start_46a
1713      const-string v3, "SystemServer"
1714
1715      const-string v9, "Wallpaper Service"
1716
1717      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
1718
1719 -    if-nez v16, :cond_47e
1720 +    if-nez v16, :cond_483
1721
1722      new-instance v111, Lcom/android/server/WallpaperManagerService;
1723
1724      move-object/from16 v0, v111
1725
1726      invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
1727 -    :try_end_475
1728 -    .catch Ljava/lang/Throwable; {:try_start_465 .. :try_end_475} :catch_83e
1729 +    :try_end_47a
1730 +    .catch Ljava/lang/Throwable; {:try_start_46a .. :try_end_47a} :catch_843
1731
1732 -    :try_start_475
1733 +    :try_start_47a
1734      const-string v3, "wallpaper"
1735
1736      move-object/from16 v0, v111
1737
1738      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1739 -    :try_end_47c
1740 -    .catch Ljava/lang/Throwable; {:try_start_475 .. :try_end_47c} :catch_969
1741 +    :try_end_481
1742 +    .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_481} :catch_96e
1743
1744      move-object/from16 v110, v111
1745
1746 -    :cond_47e
1747 -    :goto_47e
1748 +    :cond_483
1749 +    :goto_483
1750      const-string v3, "0"
1751
1752      const-string v9, "system_init.startaudioservice"
1753 @@ -1365,9 +1404,9 @@
1754
1755      move-result v3
1756
1757 -    if-nez v3, :cond_49d
1758 +    if-nez v3, :cond_4a2
1759
1760 -    :try_start_48c
1761 +    :try_start_491
1762      const-string v3, "SystemServer"
1763
1764      const-string v9, "Audio Service"
1765 @@ -1381,12 +1420,12 @@
1766      invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
1767
1768      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1769 -    :try_end_49d
1770 -    .catch Ljava/lang/Throwable; {:try_start_48c .. :try_end_49d} :catch_84a
1771 +    :try_end_4a2
1772 +    .catch Ljava/lang/Throwable; {:try_start_491 .. :try_end_4a2} :catch_84f
1773
1774 -    :cond_49d
1775 -    :goto_49d
1776 -    :try_start_49d
1777 +    :cond_4a2
1778 +    :goto_4a2
1779 +    :try_start_4a2
1780      const-string v3, "SystemServer"
1781
1782      const-string v9, "Dock Observer"
1783 @@ -1398,13 +1437,13 @@
1784      move-object/from16 v0, v61
1785
1786      invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
1787 -    :try_end_4ab
1788 -    .catch Ljava/lang/Throwable; {:try_start_49d .. :try_end_4ab} :catch_856
1789 +    :try_end_4b0
1790 +    .catch Ljava/lang/Throwable; {:try_start_4a2 .. :try_end_4b0} :catch_85b
1791
1792      move-object/from16 v60, v61
1793
1794 -    :goto_4ad
1795 -    :try_start_4ad
1796 +    :goto_4b2
1797 +    :try_start_4b2
1798      const-string v3, "SystemServer"
1799
1800      const-string v9, "Wired Accessory Observer"
1801 @@ -1414,11 +1453,11 @@
1802      new-instance v3, Lcom/android/server/WiredAccessoryObserver;
1803
1804      invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
1805 -    :try_end_4b9
1806 -    .catch Ljava/lang/Throwable; {:try_start_4ad .. :try_end_4b9} :catch_862
1807 +    :try_end_4be
1808 +    .catch Ljava/lang/Throwable; {:try_start_4b2 .. :try_end_4be} :catch_867
1809
1810 -    :goto_4b9
1811 -    :try_start_4b9
1812 +    :goto_4be
1813 +    :try_start_4be
1814      const-string v3, "SystemServer"
1815
1816      const-string v9, "USB Service"
1817 @@ -1430,22 +1469,22 @@
1818      move-object/from16 v0, v106
1819
1820      invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
1821 -    :try_end_4c7
1822 -    .catch Ljava/lang/Throwable; {:try_start_4b9 .. :try_end_4c7} :catch_86e
1823 +    :try_end_4cc
1824 +    .catch Ljava/lang/Throwable; {:try_start_4be .. :try_end_4cc} :catch_873
1825
1826 -    :try_start_4c7
1827 +    :try_start_4cc
1828      const-string v3, "usb"
1829
1830      move-object/from16 v0, v106
1831
1832      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1833 -    :try_end_4ce
1834 -    .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4ce} :catch_964
1835 +    :try_end_4d3
1836 +    .catch Ljava/lang/Throwable; {:try_start_4cc .. :try_end_4d3} :catch_969
1837
1838      move-object/from16 v105, v106
1839
1840 -    :goto_4d0
1841 -    :try_start_4d0
1842 +    :goto_4d5
1843 +    :try_start_4d5
1844      const-string v3, "SystemServer"
1845
1846      const-string v9, "Serial Service"
1847 @@ -1457,22 +1496,22 @@
1848      move-object/from16 v0, v94
1849
1850      invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
1851 -    :try_end_4de
1852 -    .catch Ljava/lang/Throwable; {:try_start_4d0 .. :try_end_4de} :catch_87a
1853 +    :try_end_4e3
1854 +    .catch Ljava/lang/Throwable; {:try_start_4d5 .. :try_end_4e3} :catch_87f
1855
1856 -    :try_start_4de
1857 +    :try_start_4e3
1858      const-string v3, "serial"
1859
1860      move-object/from16 v0, v94
1861
1862      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1863 -    :try_end_4e5
1864 -    .catch Ljava/lang/Throwable; {:try_start_4de .. :try_end_4e5} :catch_95f
1865 +    :try_end_4ea
1866 +    .catch Ljava/lang/Throwable; {:try_start_4e3 .. :try_end_4ea} :catch_964
1867
1868      move-object/from16 v93, v94
1869
1870 -    :goto_4e7
1871 -    :try_start_4e7
1872 +    :goto_4ec
1873 +    :try_start_4ec
1874      const-string v3, "SystemServer"
1875
1876      const-string v9, "UI Mode Manager Service"
1877 @@ -1484,13 +1523,13 @@
1878      move-object/from16 v0, v104
1879
1880      invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
1881 -    :try_end_4f5
1882 -    .catch Ljava/lang/Throwable; {:try_start_4e7 .. :try_end_4f5} :catch_886
1883 +    :try_end_4fa
1884 +    .catch Ljava/lang/Throwable; {:try_start_4ec .. :try_end_4fa} :catch_88b
1885
1886      move-object/from16 v103, v104
1887
1888 -    :goto_4f7
1889 -    :try_start_4f7
1890 +    :goto_4fc
1891 +    :try_start_4fc
1892      const-string v3, "SystemServer"
1893
1894      const-string v9, "Backup Service"
1895 @@ -1504,11 +1543,11 @@
1896      invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
1897
1898      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1899 -    :try_end_508
1900 -    .catch Ljava/lang/Throwable; {:try_start_4f7 .. :try_end_508} :catch_892
1901 +    :try_end_50d
1902 +    .catch Ljava/lang/Throwable; {:try_start_4fc .. :try_end_50d} :catch_897
1903
1904 -    :goto_508
1905 -    :try_start_508
1906 +    :goto_50d
1907 +    :try_start_50d
1908      const-string v3, "SystemServer"
1909
1910      const-string v9, "AppWidget Service"
1911 @@ -1520,22 +1559,22 @@
1912      move-object/from16 v0, v43
1913
1914      invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
1915 -    :try_end_516
1916 -    .catch Ljava/lang/Throwable; {:try_start_508 .. :try_end_516} :catch_89e
1917 +    :try_end_51b
1918 +    .catch Ljava/lang/Throwable; {:try_start_50d .. :try_end_51b} :catch_8a3
1919
1920 -    :try_start_516
1921 +    :try_start_51b
1922      const-string v3, "appwidget"
1923
1924      move-object/from16 v0, v43
1925
1926      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1927 -    :try_end_51d
1928 -    .catch Ljava/lang/Throwable; {:try_start_516 .. :try_end_51d} :catch_95a
1929 +    :try_end_522
1930 +    .catch Ljava/lang/Throwable; {:try_start_51b .. :try_end_522} :catch_95f
1931
1932      move-object/from16 v42, v43
1933
1934 -    :goto_51f
1935 -    :try_start_51f
1936 +    :goto_524
1937 +    :try_start_524
1938      const-string v3, "SystemServer"
1939
1940      const-string v9, "Recognition Service"
1941 @@ -1547,13 +1586,13 @@
1942      move-object/from16 v0, v92
1943
1944      invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
1945 -    :try_end_52d
1946 -    .catch Ljava/lang/Throwable; {:try_start_51f .. :try_end_52d} :catch_8aa
1947 +    :try_end_532
1948 +    .catch Ljava/lang/Throwable; {:try_start_524 .. :try_end_532} :catch_8af
1949
1950      move-object/from16 v91, v92
1951
1952 -    :goto_52f
1953 -    :try_start_52f
1954 +    :goto_534
1955 +    :try_start_534
1956      const-string v3, "SystemServer"
1957
1958      const-string v9, "DiskStats Service"
1959 @@ -1567,11 +1606,11 @@
1960      invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
1961
1962      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1963 -    :try_end_540
1964 -    .catch Ljava/lang/Throwable; {:try_start_52f .. :try_end_540} :catch_8b6
1965 +    :try_end_545
1966 +    .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_545} :catch_8bb
1967
1968 -    :goto_540
1969 -    :try_start_540
1970 +    :goto_545
1971 +    :try_start_545
1972      const-string v3, "SystemServer"
1973
1974      const-string v9, "SamplingProfiler Service"
1975 @@ -1585,11 +1624,11 @@
1976      invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
1977
1978      invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
1979 -    :try_end_551
1980 -    .catch Ljava/lang/Throwable; {:try_start_540 .. :try_end_551} :catch_8c2
1981 +    :try_end_556
1982 +    .catch Ljava/lang/Throwable; {:try_start_545 .. :try_end_556} :catch_8c7
1983
1984 -    :goto_551
1985 -    :try_start_551
1986 +    :goto_556
1987 +    :try_start_556
1988      const-string v3, "SystemServer"
1989
1990      const-string v9, "NetworkTimeUpdateService"
1991 @@ -1601,13 +1640,13 @@
1992      move-object/from16 v0, v83
1993
1994      invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
1995 -    :try_end_55f
1996 -    .catch Ljava/lang/Throwable; {:try_start_551 .. :try_end_55f} :catch_8ce
1997 +    :try_end_564
1998 +    .catch Ljava/lang/Throwable; {:try_start_556 .. :try_end_564} :catch_8d3
1999
2000      move-object/from16 v82, v83
2001
2002 -    :goto_561
2003 -    :try_start_561
2004 +    :goto_566
2005 +    :try_start_566
2006      const-string v3, "SystemServer"
2007
2008      const-string v9, "CommonTimeManagementService"
2009 @@ -1619,22 +1658,22 @@
2010      move-object/from16 v0, v51
2011
2012      invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
2013 -    :try_end_56f
2014 -    .catch Ljava/lang/Throwable; {:try_start_561 .. :try_end_56f} :catch_8da
2015 +    :try_end_574
2016 +    .catch Ljava/lang/Throwable; {:try_start_566 .. :try_end_574} :catch_8df
2017
2018 -    :try_start_56f
2019 +    :try_start_574
2020      const-string v3, "commontime_management"
2021
2022      move-object/from16 v0, v51
2023
2024      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2025 -    :try_end_576
2026 -    .catch Ljava/lang/Throwable; {:try_start_56f .. :try_end_576} :catch_956
2027 +    :try_end_57b
2028 +    .catch Ljava/lang/Throwable; {:try_start_574 .. :try_end_57b} :catch_95b
2029
2030      move-object/from16 v50, v51
2031
2032 -    :goto_578
2033 -    :try_start_578
2034 +    :goto_57d
2035 +    :try_start_57d
2036      const-string v3, "SystemServer"
2037
2038      const-string v9, "CertBlacklister"
2039 @@ -1644,10 +1683,10 @@
2040      new-instance v3, Lcom/android/server/CertBlacklister;
2041
2042      invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
2043 -    :try_end_584
2044 -    .catch Ljava/lang/Throwable; {:try_start_578 .. :try_end_584} :catch_8e6
2045 +    :try_end_589
2046 +    .catch Ljava/lang/Throwable; {:try_start_57d .. :try_end_589} :catch_8eb
2047
2048 -    :goto_584
2049 +    :goto_589
2050      invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
2051
2052      move-result-object v3
2053 @@ -1658,9 +1697,9 @@
2054
2055      move-result v3
2056
2057 -    if-eqz v3, :cond_5a8
2058 +    if-eqz v3, :cond_5ad
2059
2060 -    :try_start_591
2061 +    :try_start_596
2062      const-string v3, "SystemServer"
2063
2064      const-string v9, "Dreams Service"
2065 @@ -1672,27 +1711,27 @@
2066      move-object/from16 v0, v63
2067
2068      invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
2069 -    :try_end_59f
2070 -    .catch Ljava/lang/Throwable; {:try_start_591 .. :try_end_59f} :catch_8f2
2071 +    :try_end_5a4
2072 +    .catch Ljava/lang/Throwable; {:try_start_596 .. :try_end_5a4} :catch_8f7
2073
2074 -    :try_start_59f
2075 +    :try_start_5a4
2076      const-string v3, "dreams"
2077
2078      move-object/from16 v0, v63
2079
2080      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2081 -    :try_end_5a6
2082 -    .catch Ljava/lang/Throwable; {:try_start_59f .. :try_end_5a6} :catch_952
2083 +    :try_end_5ab
2084 +    .catch Ljava/lang/Throwable; {:try_start_5a4 .. :try_end_5ab} :catch_957
2085
2086      move-object/from16 v62, v63
2087
2088 -    :cond_5a8
2089 -    :goto_5a8
2090 +    :cond_5ad
2091 +    :goto_5ad
2092      invoke-virtual/range {v116 .. v116}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
2093
2094      move-result v28
2095
2096 -    if-eqz v28, :cond_8fe
2097 +    if-eqz v28, :cond_903
2098
2099      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
2100
2101 @@ -1710,38 +1749,38 @@
2102
2103      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
2104
2105 -    :goto_5bf
2106 -    :try_start_5bf
2107 -    invoke-virtual/range {v107 .. v107}, Lcom/android/server/VibratorService;->systemReady()V
2108 -    :try_end_5c2
2109 -    .catch Ljava/lang/Throwable; {:try_start_5bf .. :try_end_5c2} :catch_907
2110 -
2111 -    :goto_5c2
2112 -    if-eqz v58, :cond_5c7
2113 -
2114 +    :goto_5c4
2115      :try_start_5c4
2116 -    invoke-virtual/range {v58 .. v58}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
2117 +    invoke-virtual/range {v107 .. v107}, Lcom/android/server/VibratorService;->systemReady()V
2118      :try_end_5c7
2119 -    .catch Ljava/lang/Throwable; {:try_start_5c4 .. :try_end_5c7} :catch_913
2120 +    .catch Ljava/lang/Throwable; {:try_start_5c4 .. :try_end_5c7} :catch_90c
2121
2122 -    :cond_5c7
2123      :goto_5c7
2124 -    if-eqz v84, :cond_5cc
2125 +    if-eqz v58, :cond_5cc
2126
2127      :try_start_5c9
2128 -    invoke-virtual/range {v84 .. v84}, Lcom/android/server/NotificationManagerService;->systemReady()V
2129 +    invoke-virtual/range {v58 .. v58}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
2130      :try_end_5cc
2131 -    .catch Ljava/lang/Throwable; {:try_start_5c9 .. :try_end_5cc} :catch_91f
2132 +    .catch Ljava/lang/Throwable; {:try_start_5c9 .. :try_end_5cc} :catch_918
2133
2134      :cond_5cc
2135      :goto_5cc
2136 -    :try_start_5cc
2137 +    if-eqz v84, :cond_5d1
2138 +
2139 +    :try_start_5ce
2140 +    invoke-virtual/range {v84 .. v84}, Lcom/android/server/NotificationManagerService;->systemReady()V
2141 +    :try_end_5d1
2142 +    .catch Ljava/lang/Throwable; {:try_start_5ce .. :try_end_5d1} :catch_924
2143 +
2144 +    :cond_5d1
2145 +    :goto_5d1
2146 +    :try_start_5d1
2147      invoke-virtual/range {v116 .. v116}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
2148 -    :try_end_5cf
2149 -    .catch Ljava/lang/Throwable; {:try_start_5cc .. :try_end_5cf} :catch_92b
2150 +    :try_end_5d4
2151 +    .catch Ljava/lang/Throwable; {:try_start_5d1 .. :try_end_5d4} :catch_930
2152
2153 -    :goto_5cf
2154 -    if-eqz v28, :cond_5d8
2155 +    :goto_5d4
2156 +    if-eqz v28, :cond_5dd
2157
2158      invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
2159
2160 @@ -1749,7 +1788,7 @@
2161
2162      invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
2163
2164 -    :cond_5d8
2165 +    :cond_5dd
2166      invoke-virtual/range {v116 .. v116}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
2167
2168      move-result-object v52
2169 @@ -1786,18 +1825,18 @@
2170
2171      invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
2172
2173 -    :try_start_600
2174 +    :try_start_605
2175      invoke-interface/range {v87 .. v87}, Landroid/content/pm/IPackageManager;->systemReady()V
2176 -    :try_end_603
2177 -    .catch Ljava/lang/Throwable; {:try_start_600 .. :try_end_603} :catch_937
2178 +    :try_end_608
2179 +    .catch Ljava/lang/Throwable; {:try_start_605 .. :try_end_608} :catch_93c
2180
2181 -    :goto_603
2182 -    :try_start_603
2183 +    :goto_608
2184 +    :try_start_608
2185      invoke-virtual/range {v75 .. v75}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
2186 -    :try_end_606
2187 -    .catch Ljava/lang/Throwable; {:try_start_603 .. :try_end_606} :catch_943
2188 +    :try_end_60b
2189 +    .catch Ljava/lang/Throwable; {:try_start_608 .. :try_end_60b} :catch_948
2190
2191 -    :goto_606
2192 +    :goto_60b
2193      move-object/from16 v17, v4
2194
2195      move-object/from16 v18, v5
2196 @@ -1860,7 +1899,7 @@
2197
2198      move-result v3
2199
2200 -    if-eqz v3, :cond_64f
2201 +    if-eqz v3, :cond_654
2202
2203      const-string v3, "SystemServer"
2204
2205 @@ -1868,7 +1907,7 @@
2206
2207      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
2208
2209 -    :cond_64f
2210 +    :cond_654
2211      invoke-static {}, Landroid/os/Looper;->loop()V
2212
2213      const-string v3, "SystemServer"
2214 @@ -1879,25 +1918,25 @@
2215
2216      return-void
2217
2218 -    :cond_65a
2219 +    :cond_65f
2220      const/16 v90, 0x0
2221
2222      goto/16 :goto_35
2223
2224 -    :cond_65e
2225 +    :cond_663
2226      const/16 v89, 0x0
2227
2228      goto/16 :goto_47
2229
2230 -    :cond_662
2231 +    :cond_667
2232      invoke-static/range {v66 .. v66}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
2233
2234      move-result v65
2235
2236      goto/16 :goto_60
2237
2238 -    :cond_668
2239 -    :try_start_668
2240 +    :cond_66d
2241 +    :try_start_66d
2242      const-string v3, "1"
2243
2244      move-object/from16 v0, v57
2245 @@ -1918,12 +1957,12 @@
2246
2247      goto/16 :goto_113
2248
2249 -    :cond_67d
2250 +    :cond_682
2251      const/4 v3, 0x0
2252
2253      goto/16 :goto_116
2254
2255 -    :catch_680
2256 +    :catch_685
2257      move-exception v64
2258
2259      const-string v3, "SystemServer"
2260 @@ -1933,19 +1972,19 @@
2261      move-object/from16 v0, v64
2262
2263      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2264 -    :try_end_68a
2265 -    .catch Ljava/lang/RuntimeException; {:try_start_668 .. :try_end_68a} :catch_68c
2266 +    :try_end_68f
2267 +    .catch Ljava/lang/RuntimeException; {:try_start_66d .. :try_end_68f} :catch_691
2268
2269      goto/16 :goto_13e
2270
2271 -    :catch_68c
2272 +    :catch_691
2273      move-exception v64
2274
2275      move-object/from16 v7, v41
2276
2277      move-object/from16 v5, v44
2278
2279 -    :goto_691
2280 +    :goto_696
2281      const-string v3, "System"
2282
2283      const-string v9, "******************************************"
2284 @@ -1960,51 +1999,51 @@
2285
2286      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2287
2288 -    goto/16 :goto_205
2289 +    goto/16 :goto_20a
2290
2291 -    :cond_6a3
2292 +    :cond_6a8
2293      const/4 v3, 0x0
2294
2295      goto/16 :goto_14b
2296
2297 -    :cond_6a6
2298 +    :cond_6ab
2299      const/4 v3, 0x0
2300
2301      move v9, v3
2302
2303 -    goto/16 :goto_1c8
2304 +    goto/16 :goto_1cd
2305
2306 -    :cond_6aa
2307 +    :cond_6af
2308      const/4 v3, 0x0
2309
2310 -    goto/16 :goto_1cb
2311 +    goto/16 :goto_1d0
2312
2313 -    :cond_6ad
2314 +    :cond_6b2
2315      const/4 v3, 0x1
2316
2317      move/from16 v0, v65
2318
2319 -    if-ne v0, v3, :cond_6c1
2320 +    if-ne v0, v3, :cond_6c6
2321
2322 -    :try_start_6b2
2323 +    :try_start_6b7
2324      const-string v3, "SystemServer"
2325
2326      const-string v9, "No Bluetooth Service (factory test)"
2327
2328      invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
2329
2330 -    goto/16 :goto_201
2331 +    goto/16 :goto_206
2332
2333 -    :catch_6bb
2334 +    :catch_6c0
2335      move-exception v64
2336
2337      move-object/from16 v107, v108
2338
2339      move-object/from16 v71, v72
2340
2341 -    goto :goto_691
2342 +    goto :goto_696
2343
2344 -    :cond_6c1
2345 +    :cond_6c6
2346      const-string v3, "SystemServer"
2347
2348      const-string v9, "Bluetooth Service"
2349 @@ -2016,10 +2055,10 @@
2350      move-object/from16 v0, v46
2351
2352      invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
2353 -    :try_end_6cf
2354 -    .catch Ljava/lang/RuntimeException; {:try_start_6b2 .. :try_end_6cf} :catch_6bb
2355 +    :try_end_6d4
2356 +    .catch Ljava/lang/RuntimeException; {:try_start_6b7 .. :try_end_6d4} :catch_6c0
2357
2358 -    :try_start_6cf
2359 +    :try_start_6d4
2360      const-string v3, "bluetooth"
2361
2362      move-object/from16 v0, v46
2363 @@ -2040,7 +2079,7 @@
2364
2365      move-result v3
2366
2367 -    if-nez v3, :cond_6fc
2368 +    if-nez v3, :cond_701
2369
2370      new-instance v48, Landroid/server/BluetoothA2dpService;
2371
2372 @@ -2049,10 +2088,10 @@
2373      move-object/from16 v1, v46
2374
2375      invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
2376 -    :try_end_6f0
2377 -    .catch Ljava/lang/RuntimeException; {:try_start_6cf .. :try_end_6f0} :catch_9dc
2378 +    :try_end_6f5
2379 +    .catch Ljava/lang/RuntimeException; {:try_start_6d4 .. :try_end_6f5} :catch_9e1
2380
2381 -    :try_start_6f0
2382 +    :try_start_6f5
2383      const-string v3, "bluetooth_a2dp"
2384
2385      move-object/from16 v0, v48
2386 @@ -2060,13 +2099,13 @@
2387      invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
2388
2389      invoke-virtual/range {v46 .. v46}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
2390 -    :try_end_6fa
2391 -    .catch Ljava/lang/RuntimeException; {:try_start_6f0 .. :try_end_6fa} :catch_9e5
2392 +    :try_end_6ff
2393 +    .catch Ljava/lang/RuntimeException; {:try_start_6f5 .. :try_end_6ff} :catch_9ea
2394
2395      move-object/from16 v47, v48
2396
2397 -    :cond_6fc
2398 -    :try_start_6fc
2399 +    :cond_701
2400 +    :try_start_701
2401      move-object/from16 v0, p0
2402
2403      iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
2404 @@ -2079,21 +2118,21 @@
2405
2406      move-result v49
2407
2408 -    if-eqz v49, :cond_70c
2409 +    if-eqz v49, :cond_711
2410
2411      invoke-virtual/range {v46 .. v46}, Landroid/server/BluetoothService;->enable()Z
2412 -    :try_end_70c
2413 -    .catch Ljava/lang/RuntimeException; {:try_start_6fc .. :try_end_70c} :catch_9dc
2414 +    :try_end_711
2415 +    .catch Ljava/lang/RuntimeException; {:try_start_701 .. :try_end_711} :catch_9e1
2416
2417 -    :cond_70c
2418 +    :cond_711
2419      move-object/from16 v45, v46
2420
2421 -    goto/16 :goto_201
2422 +    goto/16 :goto_206
2423
2424 -    :catch_710
2425 +    :catch_715
2426      move-exception v64
2427
2428 -    :goto_711
2429 +    :goto_716
2430      const-string v3, "starting Input Manager Service"
2431
2432      move-object/from16 v0, p0
2433 @@ -2102,9 +2141,9 @@
2434
2435      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2436
2437 -    goto/16 :goto_239
2438 +    goto/16 :goto_23e
2439
2440 -    :catch_71c
2441 +    :catch_721
2442      move-exception v64
2443
2444      const-string v3, "starting Accessibility Manager"
2445 @@ -2115,9 +2154,9 @@
2446
2447      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2448
2449 -    goto/16 :goto_24a
2450 +    goto/16 :goto_24f
2451
2452 -    :catch_728
2453 +    :catch_72d
2454      move-exception v64
2455
2456      const-string v3, "making display ready"
2457 @@ -2128,9 +2167,9 @@
2458
2459      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2460
2461 -    goto/16 :goto_24d
2462 +    goto/16 :goto_252
2463
2464 -    :catch_734
2465 +    :catch_739
2466      move-exception v64
2467
2468      const-string v3, "performing boot dexopt"
2469 @@ -2141,12 +2180,12 @@
2470
2471      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2472
2473 -    goto/16 :goto_250
2474 +    goto/16 :goto_255
2475
2476 -    :catch_740
2477 +    :catch_745
2478      move-exception v64
2479
2480 -    :goto_741
2481 +    :goto_746
2482      const-string v3, "starting Mount Service"
2483
2484      move-object/from16 v0, p0
2485 @@ -2155,12 +2194,12 @@
2486
2487      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2488
2489 -    goto/16 :goto_28f
2490 +    goto/16 :goto_294
2491
2492 -    :catch_74c
2493 +    :catch_751
2494      move-exception v64
2495
2496 -    :goto_74d
2497 +    :goto_752
2498      const-string v3, "starting LockSettingsService service"
2499
2500      move-object/from16 v0, p0
2501 @@ -2169,12 +2208,12 @@
2502
2503      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2504
2505 -    goto/16 :goto_2a6
2506 +    goto/16 :goto_2ab
2507
2508 -    :catch_758
2509 +    :catch_75d
2510      move-exception v64
2511
2512 -    :goto_759
2513 +    :goto_75e
2514      const-string v3, "starting DevicePolicyService"
2515
2516      move-object/from16 v0, p0
2517 @@ -2183,12 +2222,12 @@
2518
2519      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2520
2521 -    goto/16 :goto_2bd
2522 +    goto/16 :goto_2c2
2523
2524 -    :catch_764
2525 +    :catch_769
2526      move-exception v64
2527
2528 -    :goto_765
2529 +    :goto_76a
2530      const-string v3, "starting StatusBarManagerService"
2531
2532      move-object/from16 v0, p0
2533 @@ -2197,9 +2236,9 @@
2534
2535      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2536
2537 -    goto/16 :goto_2d6
2538 +    goto/16 :goto_2db
2539
2540 -    :catch_770
2541 +    :catch_775
2542      move-exception v64
2543
2544      const-string v3, "starting Clipboard Service"
2545 @@ -2210,9 +2249,9 @@
2546
2547      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2548
2549 -    goto/16 :goto_2e7
2550 +    goto/16 :goto_2ec
2551
2552 -    :catch_77c
2553 +    :catch_781
2554      move-exception v64
2555
2556      const-string v3, "starting NetworkManagement Service"
2557 @@ -2223,12 +2262,12 @@
2558
2559      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2560
2561 -    goto/16 :goto_2f7
2562 +    goto/16 :goto_2fc
2563
2564 -    :catch_788
2565 +    :catch_78d
2566      move-exception v64
2567
2568 -    :goto_789
2569 +    :goto_78e
2570      const-string v3, "starting Text Service Manager Service"
2571
2572      move-object/from16 v0, p0
2573 @@ -2237,12 +2276,12 @@
2574
2575      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2576
2577 -    goto/16 :goto_30e
2578 +    goto/16 :goto_313
2579
2580 -    :catch_794
2581 +    :catch_799
2582      move-exception v64
2583
2584 -    :goto_795
2585 +    :goto_79a
2586      const-string v3, "starting NetworkStats Service"
2587
2588      move-object/from16 v0, p0
2589 @@ -2251,14 +2290,14 @@
2590
2591      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2592
2593 -    goto/16 :goto_325
2594 +    goto/16 :goto_32a
2595
2596 -    :catch_7a0
2597 +    :catch_7a5
2598      move-exception v64
2599
2600      move-object/from16 v8, v80
2601
2602 -    :goto_7a3
2603 +    :goto_7a8
2604      const-string v3, "starting NetworkPolicy Service"
2605
2606      move-object/from16 v0, p0
2607 @@ -2267,12 +2306,12 @@
2608
2609      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2610
2611 -    goto/16 :goto_33c
2612 +    goto/16 :goto_341
2613
2614 -    :catch_7ae
2615 +    :catch_7b3
2616      move-exception v64
2617
2618 -    :goto_7af
2619 +    :goto_7b4
2620      const-string v3, "starting Wi-Fi P2pService"
2621
2622      move-object/from16 v0, p0
2623 @@ -2281,12 +2320,12 @@
2624
2625      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2626
2627 -    goto/16 :goto_353
2628 +    goto/16 :goto_358
2629
2630 -    :catch_7ba
2631 +    :catch_7bf
2632      move-exception v64
2633
2634 -    :goto_7bb
2635 +    :goto_7c0
2636      const-string v3, "starting Wi-Fi Service"
2637
2638      move-object/from16 v0, p0
2639 @@ -2295,12 +2334,12 @@
2640
2641      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2642
2643 -    goto/16 :goto_36a
2644 +    goto/16 :goto_36f
2645
2646 -    :catch_7c6
2647 +    :catch_7cb
2648      move-exception v64
2649
2650 -    :goto_7c7
2651 +    :goto_7cc
2652      const-string v3, "starting Connectivity Service"
2653
2654      move-object/from16 v0, p0
2655 @@ -2309,9 +2348,9 @@
2656
2657      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2658
2659 -    goto/16 :goto_391
2660 +    goto/16 :goto_396
2661
2662 -    :catch_7d2
2663 +    :catch_7d7
2664      move-exception v64
2665
2666      const-string v3, "starting Service Discovery Service"
2667 @@ -2322,12 +2361,12 @@
2668
2669      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2670
2671 -    goto/16 :goto_3a3
2672 +    goto/16 :goto_3a8
2673
2674 -    :catch_7de
2675 +    :catch_7e3
2676      move-exception v64
2677
2678 -    :goto_7df
2679 +    :goto_7e4
2680      const-string v3, "starting ThrottleService"
2681
2682      move-object/from16 v0, p0
2683 @@ -2336,9 +2375,9 @@
2684
2685      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2686
2687 -    goto/16 :goto_3ba
2688 +    goto/16 :goto_3bf
2689
2690 -    :catch_7ea
2691 +    :catch_7ef
2692      move-exception v64
2693
2694      const-string v3, "starting UpdateLockService"
2695 @@ -2349,12 +2388,12 @@
2696
2697      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2698
2699 -    goto/16 :goto_3cb
2700 +    goto/16 :goto_3d0
2701
2702 -    :catch_7f6
2703 +    :catch_7fb
2704      move-exception v64
2705
2706 -    :goto_7f7
2707 +    :goto_7fc
2708      const-string v3, "starting Notification Manager"
2709
2710      move-object/from16 v0, p0
2711 @@ -2363,9 +2402,9 @@
2712
2713      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2714
2715 -    goto/16 :goto_3f0
2716 +    goto/16 :goto_3f5
2717
2718 -    :catch_802
2719 +    :catch_807
2720      move-exception v64
2721
2722      const-string v3, "starting DeviceStorageMonitor service"
2723 @@ -2376,12 +2415,12 @@
2724
2725      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2726
2727 -    goto/16 :goto_401
2728 +    goto/16 :goto_406
2729
2730 -    :catch_80e
2731 +    :catch_813
2732      move-exception v64
2733
2734 -    :goto_80f
2735 +    :goto_814
2736      const-string v3, "starting Location Manager"
2737
2738      move-object/from16 v0, p0
2739 @@ -2390,12 +2429,12 @@
2740
2741      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2742
2743 -    goto/16 :goto_418
2744 +    goto/16 :goto_41d
2745
2746 -    :catch_81a
2747 +    :catch_81f
2748      move-exception v64
2749
2750 -    :goto_81b
2751 +    :goto_820
2752      const-string v3, "starting Country Detector"
2753
2754      move-object/from16 v0, p0
2755 @@ -2404,9 +2443,9 @@
2756
2757      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2758
2759 -    goto/16 :goto_42f
2760 +    goto/16 :goto_434
2761
2762 -    :catch_826
2763 +    :catch_82b
2764      move-exception v64
2765
2766      const-string v3, "starting Search Service"
2767 @@ -2417,9 +2456,9 @@
2768
2769      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2770
2771 -    goto/16 :goto_440
2772 +    goto/16 :goto_445
2773
2774 -    :catch_832
2775 +    :catch_837
2776      move-exception v64
2777
2778      const-string v3, "starting DropBoxManagerService"
2779 @@ -2430,12 +2469,12 @@
2780
2781      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2782
2783 -    goto/16 :goto_458
2784 +    goto/16 :goto_45d
2785
2786 -    :catch_83e
2787 +    :catch_843
2788      move-exception v64
2789
2790 -    :goto_83f
2791 +    :goto_844
2792      const-string v3, "starting Wallpaper Service"
2793
2794      move-object/from16 v0, p0
2795 @@ -2444,9 +2483,9 @@
2796
2797      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2798
2799 -    goto/16 :goto_47e
2800 +    goto/16 :goto_483
2801
2802 -    :catch_84a
2803 +    :catch_84f
2804      move-exception v64
2805
2806      const-string v3, "starting Audio Service"
2807 @@ -2457,9 +2496,9 @@
2808
2809      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2810
2811 -    goto/16 :goto_49d
2812 +    goto/16 :goto_4a2
2813
2814 -    :catch_856
2815 +    :catch_85b
2816      move-exception v64
2817
2818      const-string v3, "starting DockObserver"
2819 @@ -2470,9 +2509,9 @@
2820
2821      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2822
2823 -    goto/16 :goto_4ad
2824 +    goto/16 :goto_4b2
2825
2826 -    :catch_862
2827 +    :catch_867
2828      move-exception v64
2829
2830      const-string v3, "starting WiredAccessoryObserver"
2831 @@ -2483,12 +2522,12 @@
2832
2833      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2834
2835 -    goto/16 :goto_4b9
2836 +    goto/16 :goto_4be
2837
2838 -    :catch_86e
2839 +    :catch_873
2840      move-exception v64
2841
2842 -    :goto_86f
2843 +    :goto_874
2844      const-string v3, "starting UsbService"
2845
2846      move-object/from16 v0, p0
2847 @@ -2497,12 +2536,12 @@
2848
2849      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2850
2851 -    goto/16 :goto_4d0
2852 +    goto/16 :goto_4d5
2853
2854 -    :catch_87a
2855 +    :catch_87f
2856      move-exception v64
2857
2858 -    :goto_87b
2859 +    :goto_880
2860      const-string v3, "SystemServer"
2861
2862      const-string v9, "Failure starting SerialService"
2863 @@ -2511,9 +2550,9 @@
2864
2865      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2866
2867 -    goto/16 :goto_4e7
2868 +    goto/16 :goto_4ec
2869
2870 -    :catch_886
2871 +    :catch_88b
2872      move-exception v64
2873
2874      const-string v3, "starting UiModeManagerService"
2875 @@ -2524,9 +2563,9 @@
2876
2877      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2878
2879 -    goto/16 :goto_4f7
2880 +    goto/16 :goto_4fc
2881
2882 -    :catch_892
2883 +    :catch_897
2884      move-exception v64
2885
2886      const-string v3, "SystemServer"
2887 @@ -2537,12 +2576,12 @@
2888
2889      invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
2890
2891 -    goto/16 :goto_508
2892 +    goto/16 :goto_50d
2893
2894 -    :catch_89e
2895 +    :catch_8a3
2896      move-exception v64
2897
2898 -    :goto_89f
2899 +    :goto_8a4
2900      const-string v3, "starting AppWidget Service"
2901
2902      move-object/from16 v0, p0
2903 @@ -2551,9 +2590,9 @@
2904
2905      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2906
2907 -    goto/16 :goto_51f
2908 +    goto/16 :goto_524
2909
2910 -    :catch_8aa
2911 +    :catch_8af
2912      move-exception v64
2913
2914      const-string v3, "starting Recognition Service"
2915 @@ -2564,9 +2603,9 @@
2916
2917      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2918
2919 -    goto/16 :goto_52f
2920 +    goto/16 :goto_534
2921
2922 -    :catch_8b6
2923 +    :catch_8bb
2924      move-exception v64
2925
2926      const-string v3, "starting DiskStats Service"
2927 @@ -2577,9 +2616,9 @@
2928
2929      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2930
2931 -    goto/16 :goto_540
2932 +    goto/16 :goto_545
2933
2934 -    :catch_8c2
2935 +    :catch_8c7
2936      move-exception v64
2937
2938      const-string v3, "starting SamplingProfiler Service"
2939 @@ -2590,9 +2629,9 @@
2940
2941      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2942
2943 -    goto/16 :goto_551
2944 +    goto/16 :goto_556
2945
2946 -    :catch_8ce
2947 +    :catch_8d3
2948      move-exception v64
2949
2950      const-string v3, "starting NetworkTimeUpdate service"
2951 @@ -2603,12 +2642,12 @@
2952
2953      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2954
2955 -    goto/16 :goto_561
2956 +    goto/16 :goto_566
2957
2958 -    :catch_8da
2959 +    :catch_8df
2960      move-exception v64
2961
2962 -    :goto_8db
2963 +    :goto_8e0
2964      const-string v3, "starting CommonTimeManagementService service"
2965
2966      move-object/from16 v0, p0
2967 @@ -2617,9 +2656,9 @@
2968
2969      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2970
2971 -    goto/16 :goto_578
2972 +    goto/16 :goto_57d
2973
2974 -    :catch_8e6
2975 +    :catch_8eb
2976      move-exception v64
2977
2978      const-string v3, "starting CertBlacklister"
2979 @@ -2630,12 +2669,12 @@
2980
2981      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2982
2983 -    goto/16 :goto_584
2984 +    goto/16 :goto_589
2985
2986 -    :catch_8f2
2987 +    :catch_8f7
2988      move-exception v64
2989
2990 -    :goto_8f3
2991 +    :goto_8f8
2992      const-string v3, "starting DreamManagerService"
2993
2994      move-object/from16 v0, p0
2995 @@ -2644,18 +2683,18 @@
2996
2997      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
2998
2999 -    goto/16 :goto_5a8
3000 +    goto/16 :goto_5ad
3001
3002 -    :cond_8fe
3003 +    :cond_903
3004      invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
3005
3006      move-result-object v3
3007
3008      invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
3009
3010 -    goto/16 :goto_5bf
3011 +    goto/16 :goto_5c4
3012
3013 -    :catch_907
3014 +    :catch_90c
3015      move-exception v64
3016
3017      const-string v3, "making Vibrator Service ready"
3018 @@ -2666,9 +2705,9 @@
3019
3020      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3021
3022 -    goto/16 :goto_5c2
3023 +    goto/16 :goto_5c7
3024
3025 -    :catch_913
3026 +    :catch_918
3027      move-exception v64
3028
3029      const-string v3, "making Device Policy Service ready"
3030 @@ -2679,9 +2718,9 @@
3031
3032      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3033
3034 -    goto/16 :goto_5c7
3035 +    goto/16 :goto_5cc
3036
3037 -    :catch_91f
3038 +    :catch_924
3039      move-exception v64
3040
3041      const-string v3, "making Notification Service ready"
3042 @@ -2692,9 +2731,9 @@
3043
3044      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3045
3046 -    goto/16 :goto_5cc
3047 +    goto/16 :goto_5d1
3048
3049 -    :catch_92b
3050 +    :catch_930
3051      move-exception v64
3052
3053      const-string v3, "making Window Manager Service ready"
3054 @@ -2705,9 +2744,9 @@
3055
3056      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3057
3058 -    goto/16 :goto_5cf
3059 +    goto/16 :goto_5d4
3060
3061 -    :catch_937
3062 +    :catch_93c
3063      move-exception v64
3064
3065      const-string v3, "making Package Manager Service ready"
3066 @@ -2718,9 +2757,9 @@
3067
3068      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3069
3070 -    goto/16 :goto_603
3071 +    goto/16 :goto_608
3072
3073 -    :catch_943
3074 +    :catch_948
3075      move-exception v64
3076
3077      const-string v3, "making Lock Settings Service ready"
3078 @@ -2731,164 +2770,164 @@
3079
3080      invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
3081
3082 -    goto/16 :goto_606
3083 +    goto/16 :goto_60b
3084
3085 -    :catch_94f
3086 +    :catch_954
3087      move-exception v3
3088
3089      goto/16 :goto_122
3090
3091 -    :catch_952
3092 +    :catch_957
3093      move-exception v64
3094
3095      move-object/from16 v62, v63
3096
3097 -    goto :goto_8f3
3098 +    goto :goto_8f8
3099
3100 -    :catch_956
3101 +    :catch_95b
3102      move-exception v64
3103
3104      move-object/from16 v50, v51
3105
3106 -    goto :goto_8db
3107 +    goto :goto_8e0
3108
3109 -    :catch_95a
3110 +    :catch_95f
3111      move-exception v64
3112
3113      move-object/from16 v42, v43
3114
3115 -    goto/16 :goto_89f
3116 +    goto/16 :goto_8a4
3117
3118 -    :catch_95f
3119 +    :catch_964
3120      move-exception v64
3121
3122      move-object/from16 v93, v94
3123
3124 -    goto/16 :goto_87b
3125 +    goto/16 :goto_880
3126
3127 -    :catch_964
3128 +    :catch_969
3129      move-exception v64
3130
3131      move-object/from16 v105, v106
3132
3133 -    goto/16 :goto_86f
3134 +    goto/16 :goto_874
3135
3136 -    :catch_969
3137 +    :catch_96e
3138      move-exception v64
3139
3140      move-object/from16 v110, v111
3141
3142 -    goto/16 :goto_83f
3143 +    goto/16 :goto_844
3144
3145 -    :catch_96e
3146 +    :catch_973
3147      move-exception v64
3148
3149      move-object/from16 v55, v56
3150
3151 -    goto/16 :goto_81b
3152 +    goto/16 :goto_820
3153
3154 -    :catch_973
3155 +    :catch_978
3156      move-exception v64
3157
3158      move-object/from16 v73, v74
3159
3160 -    goto/16 :goto_80f
3161 +    goto/16 :goto_814
3162
3163 -    :catch_978
3164 +    :catch_97d
3165      move-exception v64
3166
3167      move-object/from16 v84, v85
3168
3169 -    goto/16 :goto_7f7
3170 +    goto/16 :goto_7fc
3171
3172 -    :catch_97d
3173 +    :catch_982
3174      move-exception v64
3175
3176      move-object/from16 v99, v100
3177
3178 -    goto/16 :goto_7df
3179 +    goto/16 :goto_7e4
3180
3181 -    :catch_982
3182 +    :catch_987
3183      move-exception v64
3184
3185      move-object/from16 v53, v54
3186
3187 -    goto/16 :goto_7c7
3188 +    goto/16 :goto_7cc
3189
3190 -    :catch_987
3191 +    :catch_98c
3192      move-exception v64
3193
3194      move-object/from16 v112, v113
3195
3196 -    goto/16 :goto_7bb
3197 +    goto/16 :goto_7c0
3198
3199 -    :catch_98c
3200 +    :catch_991
3201      move-exception v64
3202
3203      move-object/from16 v114, v115
3204
3205 -    goto/16 :goto_7af
3206 +    goto/16 :goto_7b4
3207
3208 -    :catch_991
3209 +    :catch_996
3210      move-exception v64
3211
3212 -    goto/16 :goto_7a3
3213 +    goto/16 :goto_7a8
3214
3215 -    :catch_994
3216 +    :catch_999
3217      move-exception v64
3218
3219      move-object/from16 v12, v81
3220
3221 -    goto/16 :goto_795
3222 +    goto/16 :goto_79a
3223
3224 -    :catch_999
3225 +    :catch_99e
3226      move-exception v64
3227
3228      move-object/from16 v101, v102
3229
3230 -    goto/16 :goto_789
3231 +    goto/16 :goto_78e
3232
3233 -    :catch_99e
3234 +    :catch_9a3
3235      move-exception v64
3236
3237      move-object/from16 v97, v98
3238
3239 -    goto/16 :goto_765
3240 +    goto/16 :goto_76a
3241
3242 -    :catch_9a3
3243 +    :catch_9a8
3244      move-exception v64
3245
3246      move-object/from16 v58, v59
3247
3248 -    goto/16 :goto_759
3249 +    goto/16 :goto_75e
3250
3251 -    :catch_9a8
3252 +    :catch_9ad
3253      move-exception v64
3254
3255      move-object/from16 v75, v76
3256
3257 -    goto/16 :goto_74d
3258 +    goto/16 :goto_752
3259
3260 -    :catch_9ad
3261 +    :catch_9b2
3262      move-exception v64
3263
3264      move-object/from16 v78, v79
3265
3266 -    goto/16 :goto_741
3267 +    goto/16 :goto_746
3268
3269 -    :catch_9b2
3270 +    :catch_9b7
3271      move-exception v3
3272
3273 -    goto/16 :goto_263
3274 +    goto/16 :goto_268
3275
3276 -    :catch_9b5
3277 +    :catch_9ba
3278      move-exception v64
3279
3280      move-object/from16 v68, v69
3281
3282 -    goto/16 :goto_711
3283 +    goto/16 :goto_716
3284
3285 -    :catch_9ba
3286 +    :catch_9bf
3287      move-exception v64
3288
3289      move-object/from16 v7, v41
3290 @@ -2897,9 +2936,9 @@
3291
3292      move-object/from16 v6, v88
3293
3294 -    goto/16 :goto_691
3295 +    goto/16 :goto_696
3296
3297 -    :catch_9c3
3298 +    :catch_9c8
3299      move-exception v64
3300
3301      move-object/from16 v7, v41
3302 @@ -2908,18 +2947,18 @@
3303
3304      move-object/from16 v71, v72
3305
3306 -    goto/16 :goto_691
3307 +    goto/16 :goto_696
3308
3309 -    :catch_9cc
3310 +    :catch_9d1
3311      move-exception v64
3312
3313      move-object/from16 v7, v41
3314
3315      move-object/from16 v71, v72
3316
3317 -    goto/16 :goto_691
3318 +    goto/16 :goto_696
3319
3320 -    :catch_9d3
3321 +    :catch_9d8
3322      move-exception v64
3323
3324      move-object/from16 v7, v41
3325 @@ -2928,9 +2967,9 @@
3326
3327      move-object/from16 v71, v72
3328
3329 -    goto/16 :goto_691
3330 +    goto/16 :goto_696
3331
3332 -    :catch_9dc
3333 +    :catch_9e1
3334      move-exception v64
3335
3336      move-object/from16 v45, v46
3337 @@ -2939,9 +2978,9 @@
3338
3339      move-object/from16 v71, v72
3340
3341 -    goto/16 :goto_691
3342 +    goto/16 :goto_696
3343
3344 -    :catch_9e5
3345 +    :catch_9ea
3346      move-exception v64
3347
3348      move-object/from16 v47, v48
3349 @@ -2952,10 +2991,10 @@
3350
3351      move-object/from16 v71, v72
3352
3353 -    goto/16 :goto_691
3354 +    goto/16 :goto_696
3355
3356 -    :cond_9f0
3357 +    :cond_9f5
3358      move-object/from16 v8, v80
3359
3360 -    goto/16 :goto_5a8
3361 +    goto/16 :goto_5ad
3362  .end method