1 diff -Npru stock-services/smali/com/android/server/am/BroadcastQueue.smali ext-services/smali/com/android/server/am/BroadcastQueue.smali
2 --- stock-services/smali/com/android/server/am/BroadcastQueue.smali 2012-11-08 09:10:56.594544445 -0600
3 +++ ext-services/smali/com/android/server/am/BroadcastQueue.smali 2012-11-08 09:11:29.586708042 -0600
8 +.method private enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
13 + iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
17 + iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
19 + invoke-virtual {v4}, Landroid/content/Intent;->getAction()Ljava/lang/String;
21 + move-result-object v4
30 + instance-of v4, p1, Lcom/android/server/am/BroadcastFilter;
36 + check-cast v0, Lcom/android/server/am/BroadcastFilter;
40 + iget-object v4, v4, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
42 + iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
44 + iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
46 + iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
48 + check-cast p1, Lcom/android/server/am/BroadcastFilter;
50 + iget-object v4, p1, Lcom/android/server/am/BroadcastFilter;->receiverList:Lcom/android/server/am/ReceiverList;
52 + iget-object v4, v4, Lcom/android/server/am/ReceiverList;->app:Lcom/android/server/am/ProcessRecord;
54 + iget-object v4, v4, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
56 + iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
58 + .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_2a} :catch_53
66 + if-eq v3, v4, :cond_3b
68 + iget-object v4, p2, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
72 + iget-object v6, p2, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
74 + invoke-interface {v6}, Ljava/util/List;->size()I
78 + invoke-static {v2, v3, v4, v5, v6}, Landroid/privacy/surrogate/PrivacyActivityManagerService;->enforcePrivacyPermission(Ljava/lang/String;ILandroid/content/Intent;Landroid/content/Context;I)V
86 + instance-of v4, p1, Landroid/content/pm/ResolveInfo;
92 + check-cast v0, Landroid/content/pm/ResolveInfo;
96 + iget-object v4, v4, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
98 + iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
100 + iget-object v2, v4, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
102 + check-cast p1, Landroid/content/pm/ResolveInfo;
104 + iget-object v4, p1, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
106 + iget-object v4, v4, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
108 + iget v3, v4, Landroid/content/pm/ApplicationInfo;->uid:I
110 + .catch Ljava/lang/Exception; {:try_start_3c .. :try_end_52} :catch_53
120 .method private static performReceiveLocked(Lcom/android/server/am/ProcessRecord;Landroid/content/IIntentReceiver;Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZ)V
122 .annotation system Ldalvik/annotation/Throws;
123 @@ -1931,15 +2043,15 @@
126 .method final processNextBroadcast(Z)V
130 move-object/from16 v0, p0
132 iget-object v0, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
134 - move-object/from16 v34, v0
135 + move-object/from16 v35, v0
141 move-object/from16 v0, p0
142 @@ -1976,15 +2088,15 @@
144 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
146 - move-result-object v27
147 + move-result-object v28
149 - check-cast v27, Lcom/android/server/am/BroadcastRecord;
150 + check-cast v28, Lcom/android/server/am/BroadcastRecord;
152 invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
156 - move-object/from16 v0, v27
157 + move-object/from16 v0, v28
159 iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
161 @@ -1992,11 +2104,11 @@
165 - move-object/from16 v0, v27
166 + move-object/from16 v0, v28
168 iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
170 - move-object/from16 v0, v27
171 + move-object/from16 v0, v28
173 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
175 @@ -2004,43 +2116,43 @@
183 - move/from16 v0, v17
184 + move/from16 v0, v18
186 if-ge v0, v12, :cond_61
188 - move-object/from16 v0, v27
189 + move-object/from16 v0, v28
191 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
193 - move/from16 v0, v17
194 + move/from16 v0, v18
196 invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
198 - move-result-object v30
199 + move-result-object v31
201 - check-cast v30, Lcom/android/server/am/BroadcastFilter;
202 + check-cast v31, Lcom/android/server/am/BroadcastFilter;
206 move-object/from16 v0, p0
208 - move-object/from16 v1, v27
209 + move-object/from16 v1, v28
211 - move-object/from16 v2, v30
212 + move-object/from16 v2, v31
214 invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
216 - add-int/lit8 v17, v17, 0x1
217 + add-int/lit8 v18, v18, 0x1
222 move-object/from16 v0, p0
224 - move-object/from16 v1, v27
225 + move-object/from16 v1, v28
227 invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
229 @@ -2049,7 +2161,7 @@
236 .catchall {:try_start_7 .. :try_end_6b} :catchall_69
238 @@ -2094,17 +2206,17 @@
248 .catchall {:try_start_79 .. :try_end_90} :catchall_97
250 - if-nez v19, :cond_9a
251 + if-nez v20, :cond_9a
257 .catchall {:try_start_92 .. :try_end_93} :catchall_69
259 @@ -2112,7 +2224,7 @@
268 @@ -2201,7 +2313,7 @@
269 iput-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
276 move-object/from16 v0, p0
277 @@ -2220,7 +2332,7 @@
279 invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->scheduleAppGcsLocked()V
281 - if-eqz v21, :cond_fe
282 + if-eqz v22, :cond_fe
284 move-object/from16 v0, p0
286 @@ -2229,7 +2341,7 @@
287 invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->updateOomAdjLocked()V
295 @@ -2242,25 +2354,25 @@
297 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
299 - move-result-object v27
300 + move-result-object v28
302 - check-cast v27, Lcom/android/server/am/BroadcastRecord;
303 + check-cast v28, Lcom/android/server/am/BroadcastRecord;
308 - move-object/from16 v0, v27
309 + move-object/from16 v0, v28
311 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
315 - move-object/from16 v0, v27
316 + move-object/from16 v0, v28
318 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
320 invoke-interface {v3}, Ljava/util/List;->size()I
326 move-object/from16 v0, p0
327 @@ -2271,7 +2383,7 @@
331 - move-object/from16 v0, v27
332 + move-object/from16 v0, v28
334 iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
336 @@ -2283,11 +2395,11 @@
338 invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
340 - move-result-wide v23
341 + move-result-wide v24
343 - if-lez v25, :cond_1d4
344 + if-lez v26, :cond_1d4
346 - move-object/from16 v0, v27
347 + move-object/from16 v0, v28
349 iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
351 @@ -2299,7 +2411,7 @@
353 mul-long/2addr v7, v9
355 - move/from16 v0, v25
356 + move/from16 v0, v26
360 @@ -2307,7 +2419,7 @@
362 add-long/2addr v5, v7
364 - cmp-long v3, v23, v5
365 + cmp-long v3, v24, v5
369 @@ -2343,7 +2455,7 @@
371 move-result-object v5
373 - move-wide/from16 v0, v23
374 + move-wide/from16 v0, v24
376 invoke-virtual {v5, v0, v1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
378 @@ -2355,7 +2467,7 @@
380 move-result-object v5
382 - move-object/from16 v0, v27
383 + move-object/from16 v0, v28
385 iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
387 @@ -2369,7 +2481,7 @@
389 move-result-object v5
391 - move-object/from16 v0, v27
392 + move-object/from16 v0, v28
394 iget-wide v6, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
396 @@ -2383,7 +2495,7 @@
398 move-result-object v5
400 - move-object/from16 v0, v27
401 + move-object/from16 v0, v28
403 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
405 @@ -2397,7 +2509,7 @@
407 move-result-object v5
409 - move/from16 v0, v25
410 + move/from16 v0, v26
412 invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
414 @@ -2409,7 +2521,7 @@
416 move-result-object v5
418 - move-object/from16 v0, v27
419 + move-object/from16 v0, v28
421 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
423 @@ -2423,7 +2535,7 @@
425 move-result-object v5
427 - move-object/from16 v0, v27
428 + move-object/from16 v0, v28
430 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->state:I
432 @@ -2443,55 +2555,55 @@
434 invoke-virtual {v0, v3}, Lcom/android/server/am/BroadcastQueue;->broadcastTimeoutLocked(Z)V
441 - move-object/from16 v0, v27
442 + move-object/from16 v0, v28
444 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
447 - move-object/from16 v0, v27
448 + move-object/from16 v0, v28
450 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
466 - move-object/from16 v0, v27
467 + move-object/from16 v0, v28
469 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
473 - move-object/from16 v0, v27
474 + move-object/from16 v0, v28
476 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
478 - move/from16 v0, v25
479 + move/from16 v0, v26
481 if-ge v3, v0, :cond_1f7
483 - move-object/from16 v0, v27
484 + move-object/from16 v0, v28
486 iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
490 - if-eqz v16, :cond_23a
491 + if-eqz v17, :cond_23a
494 - move-object/from16 v0, v27
495 + move-object/from16 v0, v28
497 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
499 @@ -2500,31 +2612,31 @@
503 - move-object/from16 v0, v27
504 + move-object/from16 v0, v28
506 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->callerApp:Lcom/android/server/am/ProcessRecord;
508 - move-object/from16 v0, v27
509 + move-object/from16 v0, v28
511 iget-object v4, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
513 new-instance v5, Landroid/content/Intent;
515 - move-object/from16 v0, v27
516 + move-object/from16 v0, v28
518 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
520 invoke-direct {v5, v6}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
522 - move-object/from16 v0, v27
523 + move-object/from16 v0, v28
525 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
527 - move-object/from16 v0, v27
528 + move-object/from16 v0, v28
530 iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
532 - move-object/from16 v0, v27
533 + move-object/from16 v0, v28
535 iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
537 @@ -2536,12 +2648,12 @@
541 - move-object/from16 v0, v27
542 + move-object/from16 v0, v28
544 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->resultTo:Landroid/content/IIntentReceiver;
546 .catchall {:try_start_1fd .. :try_end_224} :catchall_69
547 - .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2b0
548 + .catch Landroid/os/RemoteException; {:try_start_1fd .. :try_end_224} :catch_2e2
552 @@ -2550,7 +2662,7 @@
554 move-object/from16 v0, p0
556 - move-object/from16 v1, v27
557 + move-object/from16 v1, v28
559 invoke-direct {v0, v1}, Lcom/android/server/am/BroadcastQueue;->addBroadcastToHistoryLocked(Lcom/android/server/am/BroadcastRecord;)V
561 @@ -2562,22 +2674,22 @@
563 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
572 - if-eqz v27, :cond_e4
573 + if-eqz v28, :cond_e4
575 - move-object/from16 v0, v27
576 + move-object/from16 v0, v28
578 iget v0, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
580 - move/from16 v28, v0
581 + move/from16 v29, v0
583 - add-int/lit8 v3, v28, 0x1
584 + add-int/lit8 v3, v29, 0x1
586 - move-object/from16 v0, v27
587 + move-object/from16 v0, v28
589 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->nextReceiver:I
591 @@ -2585,17 +2697,17 @@
595 - move-object/from16 v0, v27
596 + move-object/from16 v0, v28
598 iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
600 - if-nez v28, :cond_262
601 + if-nez v29, :cond_262
603 - move-object/from16 v0, v27
604 + move-object/from16 v0, v28
606 iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
608 - move-object/from16 v0, v27
609 + move-object/from16 v0, v28
611 iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchTime:J
613 @@ -2603,7 +2715,7 @@
617 - move-object/from16 v0, v27
618 + move-object/from16 v0, v28
620 iput-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->dispatchClockTime:J
622 @@ -2614,7 +2726,7 @@
626 - move-object/from16 v0, v27
627 + move-object/from16 v0, v28
629 iget-wide v5, v0, Lcom/android/server/am/BroadcastRecord;->receiverTime:J
631 @@ -2622,74 +2734,126 @@
633 iget-wide v7, v0, Lcom/android/server/am/BroadcastQueue;->mTimeoutPeriod:J
635 - add-long v32, v5, v7
636 + add-long v33, v5, v7
638 move-object/from16 v0, p0
640 - move-wide/from16 v1, v32
641 + move-wide/from16 v1, v33
643 invoke-virtual {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->setBroadcastTimeoutLocked(J)V
646 - move-object/from16 v0, v27
647 + move-object/from16 v0, v28
649 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receivers:Ljava/util/List;
651 - move/from16 v0, v28
652 + move/from16 v0, v29
654 invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
656 - move-result-object v22
657 + move-result-object v23
659 + move-object/from16 v0, p0
661 + move-object/from16 v1, v23
663 + move-object/from16 v2, v28
665 + invoke-direct {v0, v1, v2}, Lcom/android/server/am/BroadcastQueue;->enforcePrivacyPermission(Ljava/lang/Object;Lcom/android/server/am/BroadcastRecord;)V
669 + if-eqz v28, :cond_2b0
671 + move-object/from16 v0, v28
673 + iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
675 + if-eqz v3, :cond_2b0
677 + move-object/from16 v0, v28
679 + iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
681 + invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
683 + move-result-object v3
685 + if-eqz v3, :cond_2b0
687 + move-object/from16 v0, v28
689 + iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
691 + invoke-virtual {v3}, Landroid/content/Intent;->getAction()Ljava/lang/String;
693 + move-result-object v3
695 + const-string v5, "catchBootComplete"
697 + invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
701 + if-eqz v3, :cond_2b0
703 - move-object/from16 v0, v22
707 + move-object/from16 v0, v23
709 instance-of v3, v0, Lcom/android/server/am/BroadcastFilter;
711 - if-eqz v3, :cond_2dd
712 + if-eqz v3, :cond_323
714 - move-object/from16 v0, v22
715 + move-object/from16 v0, v23
717 check-cast v0, Lcom/android/server/am/BroadcastFilter;
719 - move-object v15, v0
720 + move-object/from16 v16, v0
722 + if-nez v15, :cond_30f
724 - move-object/from16 v0, v27
725 + move-object/from16 v0, v28
727 iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
729 move-object/from16 v0, p0
731 - move-object/from16 v1, v27
732 + move-object/from16 v1, v28
734 - invoke-direct {v0, v1, v15, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
735 + move-object/from16 v2, v16
737 - move-object/from16 v0, v27
738 + invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
741 + move-object/from16 v0, v28
743 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
745 - if-eqz v3, :cond_2a5
746 + if-eqz v3, :cond_2d7
748 - move-object/from16 v0, v27
749 + move-object/from16 v0, v28
751 iget-boolean v3, v0, Lcom/android/server/am/BroadcastRecord;->ordered:Z
753 - if-nez v3, :cond_2ad
754 + if-nez v3, :cond_2df
760 - move-object/from16 v0, v27
761 + move-object/from16 v0, v28
763 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
765 invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
778 const-string v3, "BroadcastQueue"
779 @@ -2718,7 +2882,7 @@
781 move-result-object v5
783 - move-object/from16 v0, v27
784 + move-object/from16 v0, v28
786 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
788 @@ -2734,34 +2898,57 @@
793 - move-object/from16 v0, v22
797 + move-object/from16 v0, v28
799 + iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
803 + move-object/from16 v0, v28
805 + iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
807 + move-object/from16 v0, v28
809 + iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
811 + const-string v5, "android.intent.action.BOOT_COMPLETED"
813 + invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
818 + move-object/from16 v0, v23
820 check-cast v0, Landroid/content/pm/ResolveInfo;
822 - move-object/from16 v18, v0
823 + move-object/from16 v19, v0
828 move-object/from16 v0, p0
830 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
832 - move-object/from16 v0, v18
833 + move-object/from16 v0, v19
835 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
837 iget-object v4, v5, Landroid/content/pm/ActivityInfo;->permission:Ljava/lang/String;
839 - move-object/from16 v0, v27
840 + move-object/from16 v0, v28
842 iget v5, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
844 - move-object/from16 v0, v27
845 + move-object/from16 v0, v28
847 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
849 - move-object/from16 v0, v18
850 + move-object/from16 v0, v19
852 iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
854 @@ -2769,7 +2956,7 @@
856 iget v7, v7, Landroid/content/pm/ApplicationInfo;->uid:I
858 - move-object/from16 v0, v18
859 + move-object/from16 v0, v19
861 iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
863 @@ -2777,17 +2964,17 @@
865 invoke-virtual/range {v3 .. v8}, Lcom/android/server/am/ActivityManagerService;->checkComponentPermission(Ljava/lang/String;IIIZ)I
870 - if-eqz v26, :cond_397
871 + if-eqz v27, :cond_3dd
873 - move-object/from16 v0, v18
874 + move-object/from16 v0, v19
876 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
878 iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
880 - if-nez v3, :cond_446
881 + if-nez v3, :cond_499
883 const-string v3, "BroadcastQueue"
885 @@ -2801,7 +2988,7 @@
887 move-result-object v5
889 - move-object/from16 v0, v27
890 + move-object/from16 v0, v28
892 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
894 @@ -2819,7 +3006,7 @@
896 move-result-object v5
898 - move-object/from16 v0, v27
899 + move-object/from16 v0, v28
901 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
903 @@ -2833,7 +3020,7 @@
905 move-result-object v5
907 - move-object/from16 v0, v27
908 + move-object/from16 v0, v28
910 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
912 @@ -2847,7 +3034,7 @@
914 move-result-object v5
916 - move-object/from16 v0, v27
917 + move-object/from16 v0, v28
919 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
921 @@ -2867,7 +3054,7 @@
923 move-result-object v5
925 - move-object/from16 v0, v18
926 + move-object/from16 v0, v19
928 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
930 @@ -2885,7 +3072,7 @@
932 move-result-object v5
934 - move-object/from16 v0, v18
935 + move-object/from16 v0, v19
937 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
939 @@ -2901,7 +3088,7 @@
941 move-result-object v5
943 - move-object/from16 v0, v18
944 + move-object/from16 v0, v19
946 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
948 @@ -2917,11 +3104,11 @@
950 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
958 - move-object/from16 v0, v18
960 + move-object/from16 v0, v19
962 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
964 @@ -2931,26 +3118,26 @@
968 - if-eq v3, v5, :cond_41f
969 + if-eq v3, v5, :cond_465
971 - move-object/from16 v0, v27
972 + move-object/from16 v0, v28
974 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
976 - .catchall {:try_start_224 .. :try_end_3a7} :catchall_69
978 + .catchall {:try_start_224 .. :try_end_3ed} :catchall_69
980 - if-eqz v3, :cond_41f
981 + if-eqz v3, :cond_465
985 invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
987 move-result-object v3
989 - move-object/from16 v0, v27
990 + move-object/from16 v0, v28
992 iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
994 - move-object/from16 v0, v18
995 + move-object/from16 v0, v19
997 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
999 @@ -2959,16 +3146,16 @@
1000 iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1002 invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
1004 - .catchall {:try_start_3a9 .. :try_end_3bc} :catchall_69
1005 - .catch Landroid/os/RemoteException; {:try_start_3a9 .. :try_end_3bc} :catch_4c8
1007 + .catchall {:try_start_3ef .. :try_end_402} :catchall_69
1008 + .catch Landroid/os/RemoteException; {:try_start_3ef .. :try_end_402} :catch_51b
1014 - if-eqz v26, :cond_41f
1016 + if-eqz v27, :cond_465
1020 const-string v3, "BroadcastQueue"
1022 new-instance v5, Ljava/lang/StringBuilder;
1023 @@ -2981,7 +3168,7 @@
1025 move-result-object v5
1027 - move-object/from16 v0, v27
1028 + move-object/from16 v0, v28
1030 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1032 @@ -2995,7 +3182,7 @@
1034 move-result-object v5
1036 - move-object/from16 v0, v18
1037 + move-object/from16 v0, v19
1039 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1041 @@ -3013,7 +3200,7 @@
1043 move-result-object v5
1045 - move-object/from16 v0, v27
1046 + move-object/from16 v0, v28
1048 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1050 @@ -3027,7 +3214,7 @@
1052 move-result-object v5
1054 - move-object/from16 v0, v27
1055 + move-object/from16 v0, v28
1057 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1059 @@ -3041,7 +3228,7 @@
1061 move-result-object v5
1063 - move-object/from16 v0, v27
1064 + move-object/from16 v0, v28
1066 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1068 @@ -3061,53 +3248,66 @@
1070 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1076 - move-object/from16 v0, v27
1078 + move-object/from16 v0, v28
1080 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1082 - if-eqz v3, :cond_42f
1083 + if-eqz v3, :cond_475
1085 - move-object/from16 v0, v27
1086 + move-object/from16 v0, v28
1088 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1090 iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
1092 - if-eqz v3, :cond_42f
1093 + if-eqz v3, :cond_475
1098 + if-eqz v15, :cond_482
1102 + move-object/from16 v0, v28
1104 + iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1106 + const-string v5, "android.intent.action.BOOT_COMPLETED"
1109 + invoke-virtual {v3, v5}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent;
1112 - if-eqz v29, :cond_4cd
1114 + if-eqz v30, :cond_520
1118 - move-object/from16 v0, v27
1119 + move-object/from16 v0, v28
1121 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
1125 - move-object/from16 v0, v27
1126 + move-object/from16 v0, v28
1128 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
1132 - move-object/from16 v0, v27
1133 + move-object/from16 v0, v28
1135 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1137 invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
1146 const-string v3, "BroadcastQueue"
1148 new-instance v5, Ljava/lang/StringBuilder;
1149 @@ -3120,7 +3320,7 @@
1151 move-result-object v5
1153 - move-object/from16 v0, v27
1154 + move-object/from16 v0, v28
1156 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1158 @@ -3138,7 +3338,7 @@
1160 move-result-object v5
1162 - move-object/from16 v0, v27
1163 + move-object/from16 v0, v28
1165 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1167 @@ -3152,7 +3352,7 @@
1169 move-result-object v5
1171 - move-object/from16 v0, v27
1172 + move-object/from16 v0, v28
1174 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
1176 @@ -3166,7 +3366,7 @@
1178 move-result-object v5
1180 - move-object/from16 v0, v27
1181 + move-object/from16 v0, v28
1183 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1185 @@ -3186,7 +3386,7 @@
1187 move-result-object v5
1189 - move-object/from16 v0, v18
1190 + move-object/from16 v0, v19
1192 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1194 @@ -3202,7 +3402,7 @@
1196 move-result-object v5
1198 - move-object/from16 v0, v18
1199 + move-object/from16 v0, v19
1201 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1203 @@ -3218,7 +3418,7 @@
1205 move-result-object v5
1207 - move-object/from16 v0, v18
1208 + move-object/from16 v0, v19
1210 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1212 @@ -3234,23 +3434,23 @@
1214 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1223 - const/16 v26, -0x1
1224 + const/16 v27, -0x1
1233 - move-object/from16 v0, v27
1234 + move-object/from16 v0, v28
1236 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1238 - move-object/from16 v0, v18
1239 + move-object/from16 v0, v19
1241 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1243 @@ -3258,7 +3458,7 @@
1245 new-instance v3, Landroid/content/ComponentName;
1247 - move-object/from16 v0, v18
1248 + move-object/from16 v0, v19
1250 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1252 @@ -3266,7 +3466,7 @@
1254 iget-object v5, v5, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1256 - move-object/from16 v0, v18
1257 + move-object/from16 v0, v19
1259 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1261 @@ -3274,29 +3474,29 @@
1263 invoke-direct {v3, v5, v6}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
1265 - move-object/from16 v0, v27
1266 + move-object/from16 v0, v28
1268 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1270 - move-object/from16 v0, v27
1271 + move-object/from16 v0, v28
1273 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1277 - if-eq v3, v5, :cond_521
1278 + if-eq v3, v5, :cond_574
1280 move-object/from16 v0, p0
1282 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1284 - move-object/from16 v0, v18
1285 + move-object/from16 v0, v19
1287 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1289 iget-object v5, v5, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1291 - move-object/from16 v0, v18
1292 + move-object/from16 v0, v19
1294 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1296 @@ -3304,48 +3504,48 @@
1298 invoke-virtual {v3, v5, v6}, Lcom/android/server/am/ActivityManagerService;->isSingleton(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Z
1303 - if-eqz v20, :cond_56a
1304 + if-eqz v21, :cond_5bd
1311 move-object/from16 v0, p0
1313 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1315 - move-object/from16 v0, v18
1316 + move-object/from16 v0, v19
1318 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1320 - move/from16 v0, v31
1321 + move/from16 v0, v32
1323 invoke-virtual {v3, v5, v0}, Lcom/android/server/am/ActivityManagerService;->getActivityInfoForUser(Landroid/content/pm/ActivityInfo;I)Landroid/content/pm/ActivityInfo;
1325 move-result-object v3
1327 - move-object/from16 v0, v18
1328 + move-object/from16 v0, v19
1330 iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1333 - move-object/from16 v0, v18
1335 + move-object/from16 v0, v19
1337 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1339 - move-object/from16 v0, v27
1340 + move-object/from16 v0, v28
1342 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
1344 - .catchall {:try_start_3bf .. :try_end_529} :catchall_69
1346 + .catchall {:try_start_405 .. :try_end_57c} :catchall_69
1350 invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
1352 move-result-object v3
1354 - move-object/from16 v0, v27
1355 + move-object/from16 v0, v28
1357 iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1359 @@ -3355,7 +3555,7 @@
1363 - move-object/from16 v0, v27
1364 + move-object/from16 v0, v28
1366 iget v7, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1368 @@ -3364,18 +3564,18 @@
1371 invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
1373 - .catchall {:try_start_529 .. :try_end_541} :catchall_69
1374 - .catch Landroid/os/RemoteException; {:try_start_529 .. :try_end_541} :catch_671
1375 - .catch Ljava/lang/IllegalArgumentException; {:try_start_529 .. :try_end_541} :catch_573
1377 + .catchall {:try_start_57c .. :try_end_594} :catchall_69
1378 + .catch Landroid/os/RemoteException; {:try_start_57c .. :try_end_594} :catch_6c4
1379 + .catch Ljava/lang/IllegalArgumentException; {:try_start_57c .. :try_end_594} :catch_5c6
1385 move-object/from16 v0, p0
1387 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1389 - move-object/from16 v0, v18
1390 + move-object/from16 v0, v19
1392 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1394 @@ -3387,16 +3587,16 @@
1396 move-result-object v13
1398 - if-eqz v13, :cond_5bc
1399 + if-eqz v13, :cond_60f
1401 iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
1403 - .catchall {:try_start_541 .. :try_end_555} :catchall_69
1405 + .catchall {:try_start_594 .. :try_end_5a8} :catchall_69
1407 - if-eqz v3, :cond_5bc
1408 + if-eqz v3, :cond_60f
1411 - move-object/from16 v0, v18
1413 + move-object/from16 v0, v19
1415 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1417 @@ -3406,30 +3606,30 @@
1419 move-object/from16 v0, p0
1421 - move-object/from16 v1, v27
1422 + move-object/from16 v1, v28
1424 invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
1426 - .catchall {:try_start_557 .. :try_end_567} :catchall_69
1427 - .catch Landroid/os/RemoteException; {:try_start_557 .. :try_end_567} :catch_59f
1429 + .catchall {:try_start_5aa .. :try_end_5ba} :catchall_69
1430 + .catch Landroid/os/RemoteException; {:try_start_5aa .. :try_end_5ba} :catch_5f2
1440 - move-object/from16 v0, v27
1442 + move-object/from16 v0, v28
1444 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1446 invoke-static {v3}, Landroid/os/UserId;->getUserId(I)I
1458 const-string v3, "BroadcastQueue"
1459 @@ -3444,7 +3644,7 @@
1461 move-result-object v5
1463 - move-object/from16 v0, v27
1464 + move-object/from16 v0, v28
1466 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1468 @@ -3472,9 +3672,9 @@
1470 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1479 const-string v3, "BroadcastQueue"
1480 @@ -3489,7 +3689,7 @@
1482 move-result-object v5
1484 - move-object/from16 v0, v27
1485 + move-object/from16 v0, v28
1487 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1489 @@ -3503,12 +3703,12 @@
1491 invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1495 move-object/from16 v0, p0
1497 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1499 - move-object/from16 v0, v18
1500 + move-object/from16 v0, v19
1502 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1504 @@ -3516,7 +3716,7 @@
1508 - move-object/from16 v0, v27
1509 + move-object/from16 v0, v28
1511 iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1513 @@ -3528,11 +3728,11 @@
1515 const-string v8, "broadcast"
1517 - move-object/from16 v0, v27
1518 + move-object/from16 v0, v28
1520 iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1522 - move-object/from16 v0, v27
1523 + move-object/from16 v0, v28
1525 iget-object v10, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1527 @@ -3544,22 +3744,22 @@
1529 and-int/2addr v10, v11
1531 - if-eqz v10, :cond_660
1532 + if-eqz v10, :cond_6b3
1540 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;
1542 move-result-object v3
1544 - move-object/from16 v0, v27
1545 + move-object/from16 v0, v28
1547 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1549 - if-nez v3, :cond_662
1550 + if-nez v3, :cond_6b5
1552 const-string v3, "BroadcastQueue"
1554 @@ -3573,7 +3773,7 @@
1556 move-result-object v5
1558 - move-object/from16 v0, v18
1559 + move-object/from16 v0, v19
1561 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1563 @@ -3591,7 +3791,7 @@
1565 move-result-object v5
1567 - move-object/from16 v0, v18
1568 + move-object/from16 v0, v19
1570 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1572 @@ -3609,7 +3809,7 @@
1574 move-result-object v5
1576 - move-object/from16 v0, v27
1577 + move-object/from16 v0, v28
1579 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1581 @@ -3631,23 +3831,23 @@
1583 move-object/from16 v0, p0
1585 - move-object/from16 v1, v27
1586 + move-object/from16 v1, v28
1588 invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1590 - move-object/from16 v0, v27
1591 + move-object/from16 v0, v28
1593 iget v7, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1595 - move-object/from16 v0, v27
1596 + move-object/from16 v0, v28
1598 iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1600 - move-object/from16 v0, v27
1601 + move-object/from16 v0, v28
1603 iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1605 - move-object/from16 v0, v27
1606 + move-object/from16 v0, v28
1608 iget-boolean v10, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1610 @@ -3655,7 +3855,7 @@
1612 move-object/from16 v5, p0
1614 - move-object/from16 v6, v27
1615 + move-object/from16 v6, v28
1617 invoke-virtual/range {v5 .. v11}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1619 @@ -3663,42 +3863,42 @@
1623 - move-object/from16 v0, v27
1624 + move-object/from16 v0, v28
1626 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1641 - move-object/from16 v0, v27
1643 + move-object/from16 v0, v28
1645 move-object/from16 v1, p0
1647 iput-object v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
1649 - move/from16 v0, v28
1650 + move/from16 v0, v29
1652 move-object/from16 v1, p0
1654 iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
1658 - .catchall {:try_start_567 .. :try_end_66f} :catchall_69
1661 + .catchall {:try_start_5ba .. :try_end_6c2} :catchall_69
1673 .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
1674 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali
1675 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali 1969-12-31 18:00:00.000000000 -0600
1676 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali 2012-11-08 09:11:28.422702275 -0600
1678 +.class Lcom/android/server/PrivacyTelephonyRegistry$1;
1679 +.super Landroid/content/BroadcastReceiver;
1680 +.source "PrivacyTelephonyRegistry.java"
1684 +.annotation system Ldalvik/annotation/EnclosingClass;
1685 + value = Lcom/android/server/PrivacyTelephonyRegistry;
1688 +.annotation system Ldalvik/annotation/InnerClass;
1695 +.field final synthetic this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1699 +.method constructor <init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1702 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1704 + invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
1711 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
1716 + invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
1718 + move-result-object v3
1720 + const-string v4, "android.privacy.BLOCKED_PHONE_CALL"
1722 + invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1726 + if-eqz v3, :cond_44
1728 + new-instance v0, Landroid/os/Bundle;
1730 + invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
1732 + invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
1734 + move-result-object v0
1736 + const-string v3, "packageName"
1738 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1740 + move-result-object v1
1742 + const-string v3, "packageName"
1744 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1748 + if-eqz v3, :cond_45
1750 + const-string v3, "PrivacyTelephonyRegistry"
1752 + new-instance v4, Ljava/lang/StringBuilder;
1754 + invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
1756 + const-string v5, "got blocked phone call INTENT from package: "
1758 + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1760 + move-result-object v4
1762 + const-string v5, "packageName"
1764 + invoke-virtual {v0, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1766 + move-result-object v5
1768 + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1770 + move-result-object v4
1772 + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1774 + move-result-object v4
1776 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1779 + if-nez v1, :cond_4d
1786 + const-string v3, "PrivacyTelephonyRegistry"
1788 + const-string v4, "got blocked phone call INTENT without package information"
1790 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1795 + const-string v3, "phoneState"
1797 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1801 + if-eqz v3, :cond_76
1803 + const-string v3, "phoneState"
1805 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
1809 + packed-switch v2, :pswitch_data_7e
1814 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1818 + invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1823 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1827 + invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1832 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1836 + const-string v5, "12345"
1838 + invoke-virtual {v3, v4, v5, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1843 + const-string v3, "PrivacyTelephonyRegistry"
1845 + const-string v4, "we forgot to put phoneState in Intent?"
1847 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1852 + .packed-switch 0x0
1856 + .end packed-switch
1858 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali
1859 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali 1969-12-31 18:00:00.000000000 -0600
1860 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali 2012-11-08 09:11:28.446702398 -0600
1862 +.class public Lcom/android/server/PrivacyTelephonyRegistry;
1863 +.super Lcom/android/server/TelephonyRegistry;
1864 +.source "PrivacyTelephonyRegistry.java"
1868 +.field private static final PERMISSION_CALL_STATE:I = 0x3
1870 +.field private static final PERMISSION_CELL_INFO:I = 0x1
1872 +.field private static final PERMISSION_CELL_LOCATION:I = 0x0
1874 +.field private static final PERMISSION_SERVICE_STATE:I = 0x4
1876 +.field private static final PERMISSION_SIGNAL_STRENGTH:I = 0x2
1878 +.field private static final P_TAG:Ljava/lang/String; = "PrivacyTelephonyRegistry"
1882 +.field private pSetMan:Landroid/privacy/PrivacySettingsManager;
1884 +.field private final privacyReceiver:Landroid/content/BroadcastReceiver;
1888 +.method public constructor <init>(Landroid/content/Context;)V
1891 + invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
1893 + new-instance v1, Lcom/android/server/PrivacyTelephonyRegistry$1;
1895 + invoke-direct {v1, p0}, Lcom/android/server/PrivacyTelephonyRegistry$1;-><init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1897 + iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
1899 + new-instance v1, Landroid/privacy/PrivacySettingsManager;
1901 + const-string v2, "privacy"
1903 + invoke-static {v2}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
1905 + move-result-object v2
1907 + invoke-static {v2}, Landroid/privacy/IPrivacySettingsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/privacy/IPrivacySettingsManager;
1909 + move-result-object v2
1911 + invoke-direct {v1, p1, v2}, Landroid/privacy/PrivacySettingsManager;-><init>(Landroid/content/Context;Landroid/privacy/IPrivacySettingsManager;)V
1913 + iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1916 + invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
1918 + .catch Ljava/lang/Exception; {:try_start_1b .. :try_end_1e} :catch_26
1921 + const-string v1, "PrivacyTelephonyRegistry"
1923 + const-string v2, "constructor ready"
1925 + invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1932 + const-string v1, "PrivacyTelephonyRegistry"
1934 + const-string v2, "failed to register privacy broadcastreceiver"
1936 + invoke-static {v1, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
1941 +.method private isPackageAllowed(ILjava/lang/String;)Z
1948 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1950 + invoke-static {}, Landroid/os/Process;->myUid()I
1954 + invoke-virtual {v3, p2, v4}, Landroid/privacy/PrivacySettingsManager;->getSettings(Ljava/lang/String;I)Landroid/privacy/PrivacySettings;
1956 + move-result-object v0
1958 + if-nez v0, :cond_f
1965 + packed-switch p1, :pswitch_data_42
1970 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1974 + if-nez v3, :cond_e
1976 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationGpsSetting()B
1980 + if-nez v3, :cond_e
1987 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1991 + if-nez v3, :cond_e
1998 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2002 + if-nez v3, :cond_e
2009 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2013 + if-nez v3, :cond_e
2020 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
2024 + if-nez v3, :cond_e
2033 + .packed-switch 0x0
2039 + .end packed-switch
2042 +.method private registerPrivacy()V
2045 + new-instance v0, Landroid/content/IntentFilter;
2047 + const-string v1, "android.privacy.BLOCKED_PHONE_CALL"
2049 + invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
2051 + iget-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mContext:Landroid/content/Context;
2053 + iget-object v2, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2055 + invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
2062 +.method public bridge synthetic dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2065 + invoke-super {p0, p1, p2, p3}, Lcom/android/server/TelephonyRegistry;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2070 +.method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
2074 + invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2076 + .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_3} :catch_af
2079 + if-eqz p3, :cond_110
2081 + move/from16 v0, p3
2083 + invoke-virtual {p0, v0}, Lcom/android/server/PrivacyTelephonyRegistry;->checkListenerPermission(I)V
2085 + iget-object v11, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2092 + invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2094 + move-result-object v2
2096 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2098 + invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
2100 + .catchall {:try_start_e .. :try_end_17} :catchall_d2
2106 + move-object v8, v7
2109 + if-ge v6, v1, :cond_be
2112 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2114 + invoke-virtual {v10, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
2116 + move-result-object v7
2118 + check-cast v7, Lcom/android/server/TelephonyRegistry$Record;
2120 + .catchall {:try_start_1c .. :try_end_24} :catchall_118
2123 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2125 + if-ne v2, v10, :cond_b9
2128 + iget v10, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2130 + xor-int v10, v10, p3
2132 + and-int v9, p3, v10
2134 + move/from16 v0, p3
2136 + iput v0, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2138 + .catchall {:try_start_24 .. :try_end_32} :catchall_d2
2140 + if-eqz p4, :cond_ad
2142 + and-int/lit8 v10, p3, 0x1
2144 + if-eqz v10, :cond_38
2147 + and-int/lit8 v10, p3, 0x2
2149 + if-eqz v10, :cond_4c
2152 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2154 + invoke-virtual {v10}, Landroid/telephony/SignalStrength;->getGsmSignalStrength()I
2158 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2160 + const/16 v12, 0x63
2162 + if-ne v5, v12, :cond_49
2167 + invoke-interface {v10, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
2169 + .catchall {:try_start_3c .. :try_end_4c} :catchall_d2
2170 + .catch Landroid/os/RemoteException; {:try_start_3c .. :try_end_4c} :catch_d5
2174 + and-int/lit8 v10, p3, 0x4
2176 + if-eqz v10, :cond_57
2179 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2181 + iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mMessageWaiting:Z
2183 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
2185 + .catchall {:try_start_50 .. :try_end_57} :catchall_d2
2186 + .catch Landroid/os/RemoteException; {:try_start_50 .. :try_end_57} :catch_dd
2190 + and-int/lit8 v10, p3, 0x8
2192 + if-eqz v10, :cond_62
2195 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2197 + iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallForwarding:Z
2199 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
2201 + .catchall {:try_start_5b .. :try_end_62} :catchall_d2
2202 + .catch Landroid/os/RemoteException; {:try_start_5b .. :try_end_62} :catch_e5
2206 + and-int/lit8 v10, p3, 0x10
2208 + if-eqz v10, :cond_66
2211 + and-int/lit8 v10, p3, 0x20
2213 + if-eqz v10, :cond_73
2216 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2218 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallState:I
2220 + iget-object v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallIncomingNumber:Ljava/lang/String;
2222 + invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
2224 + .catchall {:try_start_6a .. :try_end_73} :catchall_d2
2225 + .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_73} :catch_ed
2229 + and-int/lit8 v10, p3, 0x40
2231 + if-eqz v10, :cond_80
2234 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2236 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionState:I
2238 + iget v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionNetworkType:I
2240 + invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
2242 + .catchall {:try_start_77 .. :try_end_80} :catchall_d2
2243 + .catch Landroid/os/RemoteException; {:try_start_77 .. :try_end_80} :catch_f4
2247 + move/from16 v0, p3
2249 + and-int/lit16 v10, v0, 0x80
2251 + if-eqz v10, :cond_8d
2254 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2256 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataActivity:I
2258 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
2260 + .catchall {:try_start_86 .. :try_end_8d} :catchall_d2
2261 + .catch Landroid/os/RemoteException; {:try_start_86 .. :try_end_8d} :catch_fb
2265 + move/from16 v0, p3
2267 + and-int/lit16 v10, v0, 0x100
2269 + if-eqz v10, :cond_9a
2272 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2274 + iget-object v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2276 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
2278 + .catchall {:try_start_93 .. :try_end_9a} :catchall_d2
2279 + .catch Landroid/os/RemoteException; {:try_start_93 .. :try_end_9a} :catch_102
2283 + move/from16 v0, p3
2285 + and-int/lit16 v10, v0, 0x200
2287 + if-eqz v10, :cond_a7
2290 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2292 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mOtaspMode:I
2294 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
2296 + .catchall {:try_start_a0 .. :try_end_a7} :catchall_d2
2297 + .catch Landroid/os/RemoteException; {:try_start_a0 .. :try_end_a7} :catch_109
2301 + move/from16 v0, p3
2303 + and-int/lit16 v10, v0, 0x400
2305 + if-eqz v10, :cond_ad
2311 + .catchall {:try_start_ad .. :try_end_ae} :catchall_d2
2319 + const-string v10, "PrivacyTelephonyRegistry"
2321 + const-string v11, "failed to register privacy broadcastreceiver"
2323 + invoke-static {v10, v11}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2328 + add-int/lit8 v6, v6, 0x1
2330 + move-object v8, v7
2336 + new-instance v7, Lcom/android/server/TelephonyRegistry$Record;
2338 + invoke-direct {v7}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
2340 + .catchall {:try_start_be .. :try_end_c3} :catchall_118
2343 + iput-object v2, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2345 + move-object/from16 v0, p2
2347 + iput-object v0, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2349 + iput-object p1, v7, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2351 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2353 + invoke-virtual {v10, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2358 + move-exception v10
2363 + .catchall {:try_start_c3 .. :try_end_d4} :catchall_d2
2371 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2373 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2380 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2382 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2389 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2391 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2398 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2400 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2407 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2409 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2416 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2418 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2425 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2427 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2434 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2436 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2438 + .catchall {:try_start_d6 .. :try_end_10f} :catchall_d2
2443 + invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2445 + move-result-object v10
2447 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2452 + move-exception v10
2454 + move-object v7, v8
2459 +.method public bridge synthetic notifyCallForwardingChanged(Z)V
2462 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyCallForwardingChanged(Z)V
2467 +.method public bridge synthetic notifyCallState(ILjava/lang/String;)V
2470 + invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
2475 +.method public notifyCellInfo(Landroid/telephony/CellInfo;)V
2478 + const-string v2, "notifyCellInfo()"
2480 + move-object/from16 v0, p0
2482 + invoke-virtual {v0, v2}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2486 + if-nez v2, :cond_b
2492 + move-object/from16 v0, p0
2494 + iget-object v15, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2499 + move-object/from16 v0, p1
2501 + move-object/from16 v1, p0
2503 + iput-object v0, v1, Lcom/android/server/PrivacyTelephonyRegistry;->mCellInfo:Landroid/telephony/CellInfo;
2505 + move-object/from16 v0, p0
2507 + iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2509 + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2511 + move-result-object v13
2515 + invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z
2519 + if-eqz v2, :cond_cb
2521 + invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2523 + move-result-object v14
2525 + check-cast v14, Lcom/android/server/TelephonyRegistry$Record;
2527 + iget v2, v14, Lcom/android/server/TelephonyRegistry$Record;->events:I
2529 + .catchall {:try_start_10 .. :try_end_2c} :catchall_9a
2531 + and-int/lit16 v2, v2, 0x400
2533 + if-eqz v2, :cond_1e
2538 + iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2540 + move-object/from16 v0, p0
2542 + invoke-direct {v0, v2, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2546 + if-nez v2, :cond_9d
2548 + iget-object v0, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2550 + move-object/from16 v16, v0
2552 + new-instance v17, Landroid/telephony/CellInfo;
2556 + invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2558 + move-result-wide v18
2560 + invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2562 + move-result-wide v20
2566 + new-instance v10, Landroid/telephony/SignalStrength;
2568 + invoke-direct {v10}, Landroid/telephony/SignalStrength;-><init>()V
2570 + new-instance v2, Landroid/telephony/GsmCellIdentity;
2576 + const/16 v5, 0x225
2578 + const/16 v6, 0x221
2582 + const-string v8, "unknown"
2584 + invoke-direct/range {v2 .. v8}, Landroid/telephony/GsmCellIdentity;-><init>(IIIIILjava/lang/String;)V
2586 + move-object/from16 v3, v17
2590 + move-wide/from16 v5, v18
2592 + move-wide/from16 v7, v20
2594 + move-object v11, v2
2596 + invoke-direct/range {v3 .. v11}, Landroid/telephony/CellInfo;-><init>(IJJZLandroid/telephony/SignalStrength;Landroid/telephony/CellIdentity;)V
2598 + invoke-interface/range {v16 .. v17}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2600 + const-string v2, "PrivacyTelephonyRegistry"
2602 + new-instance v3, Ljava/lang/StringBuilder;
2604 + invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2606 + const-string v4, "package: "
2608 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2610 + move-result-object v3
2612 + iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2614 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2616 + move-result-object v3
2618 + const-string v4, " blocked for Cellinfo"
2620 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2622 + move-result-object v3
2624 + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2626 + move-result-object v3
2628 + invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2630 + .catchall {:try_start_31 .. :try_end_8e} :catchall_9a
2631 + .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_8e} :catch_8f
2636 + move-exception v12
2639 + move-object/from16 v0, p0
2641 + iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2643 + iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2645 + invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2654 + .catchall {:try_start_90 .. :try_end_9c} :catchall_9a
2660 + iget-object v2, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2662 + new-instance v3, Landroid/telephony/CellInfo;
2664 + move-object/from16 v0, p1
2666 + invoke-direct {v3, v0}, Landroid/telephony/CellInfo;-><init>(Landroid/telephony/CellInfo;)V
2668 + invoke-interface {v2, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2670 + const-string v2, "PrivacyTelephonyRegistry"
2672 + new-instance v3, Ljava/lang/StringBuilder;
2674 + invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2676 + const-string v4, "package: "
2678 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2680 + move-result-object v3
2682 + iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2684 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2686 + move-result-object v3
2688 + const-string v4, " allowed for Cellinfo"
2690 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2692 + move-result-object v3
2694 + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2696 + move-result-object v3
2698 + invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2700 + .catchall {:try_start_9d .. :try_end_c9} :catchall_9a
2701 + .catch Landroid/os/RemoteException; {:try_start_9d .. :try_end_c9} :catch_8f
2707 + invoke-virtual/range {p0 .. p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2711 + .catchall {:try_start_cb .. :try_end_cf} :catchall_9a
2716 +.method public notifyCellLocation(Landroid/os/Bundle;)V
2719 + const-string v8, "notifyCellLocation()"
2721 + invoke-virtual {p0, v8}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2725 + if-nez v8, :cond_9
2731 + iget-object v9, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2736 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
2738 + .catchall {:try_start_c .. :try_end_e} :catchall_7f
2745 + const-string v8, "lac"
2747 + invoke-virtual {p1, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
2749 + .catchall {:try_start_10 .. :try_end_15} :catchall_7f
2750 + .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_15} :catch_84
2754 + if-eqz v8, :cond_82
2760 + iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2762 + invoke-virtual {v8}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2764 + move-result-object v3
2768 + invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2772 + if-eqz v8, :cond_bc
2774 + invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2776 + move-result-object v6
2778 + check-cast v6, Lcom/android/server/TelephonyRegistry$Record;
2780 + iget v8, v6, Lcom/android/server/TelephonyRegistry$Record;->events:I
2782 + .catchall {:try_start_19 .. :try_end_2d} :catchall_7f
2784 + and-int/lit8 v8, v8, 0x10
2786 + if-eqz v8, :cond_1f
2791 + iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2793 + invoke-direct {p0, v8, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2797 + if-nez v8, :cond_90
2799 + if-nez v2, :cond_90
2801 + new-instance v5, Landroid/os/Bundle;
2803 + invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
2805 + if-eqz v4, :cond_87
2807 + new-instance v7, Landroid/telephony/cdma/CdmaCellLocation;
2809 + invoke-direct {v7}, Landroid/telephony/cdma/CdmaCellLocation;-><init>()V
2811 + invoke-virtual {v7, v5}, Landroid/telephony/cdma/CdmaCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2814 + iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2816 + new-instance v10, Landroid/os/Bundle;
2818 + invoke-direct {v10, v5}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2820 + invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2822 + const-string v8, "PrivacyTelephonyRegistry"
2824 + new-instance v10, Ljava/lang/StringBuilder;
2826 + invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2828 + const-string v11, "package: "
2830 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2832 + move-result-object v10
2834 + iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2836 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2838 + move-result-object v10
2840 + const-string v11, " blocked for CellLocation"
2842 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2844 + move-result-object v10
2846 + invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2848 + move-result-object v10
2850 + invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2852 + .catchall {:try_start_32 .. :try_end_75} :catchall_7f
2853 + .catch Landroid/os/RemoteException; {:try_start_32 .. :try_end_75} :catch_76
2861 + iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2863 + iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2865 + invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2874 + .catchall {:try_start_77 .. :try_end_81} :catchall_7f
2892 + new-instance v7, Landroid/telephony/gsm/GsmCellLocation;
2894 + invoke-direct {v7}, Landroid/telephony/gsm/GsmCellLocation;-><init>()V
2896 + invoke-virtual {v7, v5}, Landroid/telephony/gsm/GsmCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2901 + iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2903 + new-instance v10, Landroid/os/Bundle;
2905 + invoke-direct {v10, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2907 + invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2909 + const-string v8, "PrivacyTelephonyRegistry"
2911 + new-instance v10, Ljava/lang/StringBuilder;
2913 + invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2915 + const-string v11, "package: "
2917 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2919 + move-result-object v10
2921 + iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2923 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2925 + move-result-object v10
2927 + const-string v11, " allowed for CellLocation"
2929 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2931 + move-result-object v10
2933 + invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2935 + move-result-object v10
2937 + invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2939 + .catchall {:try_start_87 .. :try_end_ba} :catchall_7f
2940 + .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_ba} :catch_76
2946 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2950 + .catchall {:try_start_bc .. :try_end_c0} :catchall_7f
2955 +.method public bridge synthetic notifyDataActivity(I)V
2958 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyDataActivity(I)V
2963 +.method public bridge synthetic notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2966 + invoke-super/range {p0 .. p9}, Lcom/android/server/TelephonyRegistry;->notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2971 +.method public bridge synthetic notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2974 + invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2979 +.method public bridge synthetic notifyMessageWaitingChanged(Z)V
2982 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyMessageWaitingChanged(Z)V
2987 +.method public bridge synthetic notifyOtaspChanged(I)V
2990 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyOtaspChanged(I)V
2995 +.method public notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
2998 + iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3003 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3005 + invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3007 + move-result-object v1
3011 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3015 + if-eqz v3, :cond_35
3017 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3019 + move-result-object v2
3021 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3023 + iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3025 + .catchall {:try_start_3 .. :try_end_17} :catchall_32
3027 + and-int/lit8 v3, v3, 0x20
3029 + if-eqz v3, :cond_9
3032 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3034 + invoke-virtual {v3, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
3038 + if-eqz v3, :cond_9
3040 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3042 + invoke-interface {v3, p1, p2}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
3044 + .catchall {:try_start_1b .. :try_end_28} :catchall_32
3045 + .catch Landroid/os/RemoteException; {:try_start_1b .. :try_end_28} :catch_29
3053 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3055 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3057 + invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3066 + .catchall {:try_start_2a .. :try_end_34} :catchall_32
3072 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3076 + .catchall {:try_start_35 .. :try_end_39} :catchall_32
3081 +.method public notifyServiceState(Landroid/telephony/ServiceState;)V
3084 + const-string v3, "notifyServiceState()"
3086 + invoke-virtual {p0, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
3090 + if-nez v3, :cond_9
3096 + iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3101 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
3103 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3105 + invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3107 + move-result-object v1
3111 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3115 + if-eqz v3, :cond_90
3117 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3119 + move-result-object v2
3121 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3123 + iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3125 + .catchall {:try_start_c .. :try_end_22} :catchall_6c
3127 + and-int/lit8 v3, v3, 0x1
3129 + if-eqz v3, :cond_14
3134 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3136 + invoke-direct {p0, v3, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
3140 + if-nez v3, :cond_6f
3142 + const-string v3, ""
3144 + const-string v5, ""
3146 + const-string v6, ""
3148 + invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
3150 + const-string v3, "PrivacyTelephonyRegistry"
3152 + new-instance v5, Ljava/lang/StringBuilder;
3154 + invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3156 + const-string v6, "package: "
3158 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3160 + move-result-object v5
3162 + iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3164 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3166 + move-result-object v5
3168 + const-string v6, " blocked for Cellinfo"
3170 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3172 + move-result-object v5
3174 + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3176 + move-result-object v5
3178 + invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3181 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3183 + new-instance v5, Landroid/telephony/ServiceState;
3185 + invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
3187 + invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
3189 + .catchall {:try_start_27 .. :try_end_62} :catchall_6c
3190 + .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_62} :catch_63
3198 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3200 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3202 + invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3211 + .catchall {:try_start_64 .. :try_end_6e} :catchall_6c
3217 + const-string v3, "PrivacyTelephonyRegistry"
3219 + new-instance v5, Ljava/lang/StringBuilder;
3221 + invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3223 + const-string v6, "package: "
3225 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3227 + move-result-object v5
3229 + iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3231 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3233 + move-result-object v5
3235 + const-string v6, " allowed for Cellinfo"
3237 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3239 + move-result-object v5
3241 + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3243 + move-result-object v5
3245 + invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3247 + .catchall {:try_start_6f .. :try_end_8f} :catchall_6c
3248 + .catch Landroid/os/RemoteException; {:try_start_6f .. :try_end_8f} :catch_63
3254 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3258 + .catchall {:try_start_90 .. :try_end_94} :catchall_6c
3260 + invoke-virtual {p0, p1}, Lcom/android/server/PrivacyTelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
3265 +.method public bridge synthetic notifySignalStrength(Landroid/telephony/SignalStrength;)V
3268 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifySignalStrength(Landroid/telephony/SignalStrength;)V
3272 diff -Npru stock-services/smali/com/android/server/ServerThread.smali ext-services/smali/com/android/server/ServerThread.smali
3273 --- stock-services/smali/com/android/server/ServerThread.smali 2012-11-08 09:10:55.766540339 -0600
3274 +++ ext-services/smali/com/android/server/ServerThread.smali 2012-11-08 09:11:28.526702791 -0600
3279 +.method private addPrivacyService(Landroid/content/Context;)V
3283 + const-string v1, "SystemServer"
3285 + const-string v2, "Privacy Service"
3287 + invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3289 + const-string v1, "privacy"
3291 + new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
3293 + invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
3295 + invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3297 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
3305 + const-string v1, "SystemServer"
3307 + const-string v2, "Failure starting Privacy Service"
3309 + invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3314 .method static final startSystemUi(Landroid/content/Context;)V
3321 - if-ne v3, v9, :cond_6b9
3322 + if-ne v3, v9, :cond_6be
3330 - if-le v3, v9, :cond_6bd
3331 + if-le v3, v9, :cond_6c2
3339 - if-eqz v3, :cond_6c1
3340 + if-eqz v3, :cond_6c6
3346 invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3348 - .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_a3e
3349 + .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_a43
3352 const-string v3, "power"
3355 const-string v3, "telephony.registry"
3357 - new-instance v9, Lcom/android/server/TelephonyRegistry;
3358 + new-instance v9, Lcom/android/server/PrivacyTelephonyRegistry;
3360 - invoke-direct {v9, v4}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
3361 + invoke-direct {v9, v4}, Lcom/android/server/PrivacyTelephonyRegistry;-><init>(Landroid/content/Context;)V
3363 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3369 - if-eqz v3, :cond_6c7
3370 + if-eqz v3, :cond_6cc
3372 const-string v3, "SystemServer"
3378 - if-eqz v68, :cond_6dc
3379 + if-eqz v68, :cond_6e1
3385 invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
3387 - .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6eb
3388 + .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6f0
3390 move-result-object v91
3394 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3396 - .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_9d2
3397 - .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6eb
3398 + .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_9d7
3399 + .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6f0
3405 iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3407 - .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6eb
3408 + .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6f0
3411 const-string v3, "SystemServer"
3414 invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3416 - .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_6df
3417 - .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6eb
3418 + .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_6e4
3419 + .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6f0
3422 const-string v3, "account"
3425 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3427 - .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a7d
3428 - .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_a47
3429 + .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a82
3430 + .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_a4c
3432 move-object/from16 v41, v42
3438 - if-ne v0, v3, :cond_702
3439 + if-ne v0, v3, :cond_707
3443 @@ -469,6 +504,10 @@
3445 move-result-object v57
3447 + move-object/from16 v0, p0
3449 + invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
3451 const-string v3, "SystemServer"
3453 const-string v9, "System Content Providers"
3454 @@ -488,10 +527,10 @@
3455 move-object/from16 v0, v76
3457 invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3459 - .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_171} :catch_6eb
3461 + .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_176} :catch_6f0
3465 const-string v3, "SystemServer"
3467 const-string v9, "Battery Service"
3468 @@ -503,10 +542,10 @@
3469 move-object/from16 v0, v76
3471 invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3473 - .catch Ljava/lang/RuntimeException; {:try_start_171 .. :try_end_17f} :catch_a50
3475 + .catch Ljava/lang/RuntimeException; {:try_start_176 .. :try_end_184} :catch_a55
3479 const-string v3, "battery"
3481 invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3482 @@ -522,10 +561,10 @@
3483 move-object/from16 v0, v112
3485 invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3487 - .catch Ljava/lang/RuntimeException; {:try_start_17f .. :try_end_192} :catch_a59
3489 + .catch Ljava/lang/RuntimeException; {:try_start_184 .. :try_end_197} :catch_a5e
3493 const-string v3, "vibrator"
3495 move-object/from16 v0, v112
3496 @@ -549,10 +588,10 @@
3497 new-instance v7, Lcom/android/server/AlarmManagerService;
3499 invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
3501 - .catch Ljava/lang/RuntimeException; {:try_start_192 .. :try_end_1ae} :catch_a60
3503 + .catch Ljava/lang/RuntimeException; {:try_start_197 .. :try_end_1b3} :catch_a65
3507 const-string v3, "alarm"
3509 invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3510 @@ -583,18 +622,18 @@
3514 - if-eq v0, v3, :cond_705
3515 + if-eq v0, v3, :cond_70a
3522 - if-nez v71, :cond_709
3524 + if-nez v71, :cond_70e
3532 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;
3533 @@ -637,22 +676,22 @@
3537 - if-eqz v3, :cond_70c
3538 + if-eqz v3, :cond_711
3540 const-string v3, "SystemServer"
3542 const-string v9, "No Bluetooh Service (emulator)"
3544 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3546 - .catch Ljava/lang/RuntimeException; {:try_start_1ae .. :try_end_20c} :catch_71a
3548 + .catch Ljava/lang/RuntimeException; {:try_start_1b3 .. :try_end_211} :catch_71f
3552 move-object/from16 v111, v112
3554 move-object/from16 v75, v76
3565 - if-eq v0, v3, :cond_255
3566 + if-eq v0, v3, :cond_25a
3570 const-string v3, "SystemServer"
3572 const-string v9, "Input Method Service"
3573 @@ -695,22 +734,22 @@
3574 move-object/from16 v1, v120
3576 invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3578 - .catch Ljava/lang/Throwable; {:try_start_22b .. :try_end_23b} :catch_76f
3580 + .catch Ljava/lang/Throwable; {:try_start_230 .. :try_end_240} :catch_774
3584 const-string v3, "input_method"
3586 move-object/from16 v0, v73
3588 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3590 - .catch Ljava/lang/Throwable; {:try_start_23b .. :try_end_242} :catch_a39
3592 + .catch Ljava/lang/Throwable; {:try_start_240 .. :try_end_247} :catch_a3e
3594 move-object/from16 v72, v73
3600 const-string v3, "SystemServer"
3602 const-string v9, "Accessibility Manager"
3603 @@ -724,24 +763,24 @@
3604 invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
3606 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3608 - .catch Ljava/lang/Throwable; {:try_start_244 .. :try_end_255} :catch_77b
3610 + .catch Ljava/lang/Throwable; {:try_start_249 .. :try_end_25a} :catch_780
3618 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3620 - .catch Ljava/lang/Throwable; {:try_start_255 .. :try_end_258} :catch_787
3622 + .catch Ljava/lang/Throwable; {:try_start_25a .. :try_end_25d} :catch_78c
3628 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3630 - .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_25b} :catch_793
3632 + .catch Ljava/lang/Throwable; {:try_start_25d .. :try_end_260} :catch_798
3638 invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3640 move-result-object v3
3641 @@ -759,15 +798,15 @@
3644 invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3646 - .catch Landroid/os/RemoteException; {:try_start_25b .. :try_end_26e} :catch_a36
3648 + .catch Landroid/os/RemoteException; {:try_start_260 .. :try_end_273} :catch_a3b
3656 - if-eq v0, v3, :cond_a82
3657 + if-eq v0, v3, :cond_a87
3665 - if-nez v3, :cond_29a
3666 + if-nez v3, :cond_29f
3670 const-string v3, "SystemServer"
3672 const-string v9, "Mount Service"
3673 @@ -797,23 +836,23 @@
3674 move-object/from16 v0, v83
3676 invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3678 - .catch Ljava/lang/Throwable; {:try_start_283 .. :try_end_291} :catch_79f
3680 + .catch Ljava/lang/Throwable; {:try_start_288 .. :try_end_296} :catch_7a4
3684 const-string v3, "mount"
3686 move-object/from16 v0, v83
3688 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3690 - .catch Ljava/lang/Throwable; {:try_start_291 .. :try_end_298} :catch_a31
3692 + .catch Ljava/lang/Throwable; {:try_start_296 .. :try_end_29d} :catch_a36
3694 move-object/from16 v82, v83
3702 const-string v3, "SystemServer"
3704 const-string v9, "LockSettingsService"
3705 @@ -825,22 +864,22 @@
3706 move-object/from16 v0, v80
3708 invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3710 - .catch Ljava/lang/Throwable; {:try_start_29a .. :try_end_2a8} :catch_7ab
3712 + .catch Ljava/lang/Throwable; {:try_start_29f .. :try_end_2ad} :catch_7b0
3716 const-string v3, "lock_settings"
3718 move-object/from16 v0, v80
3720 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3722 - .catch Ljava/lang/Throwable; {:try_start_2a8 .. :try_end_2af} :catch_a2c
3724 + .catch Ljava/lang/Throwable; {:try_start_2ad .. :try_end_2b4} :catch_a31
3726 move-object/from16 v79, v80
3732 const-string v3, "SystemServer"
3734 const-string v9, "Device Policy"
3735 @@ -852,22 +891,22 @@
3736 move-object/from16 v0, v62
3738 invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3740 - .catch Ljava/lang/Throwable; {:try_start_2b1 .. :try_end_2bf} :catch_7b7
3742 + .catch Ljava/lang/Throwable; {:try_start_2b6 .. :try_end_2c4} :catch_7bc
3746 const-string v3, "device_policy"
3748 move-object/from16 v0, v62
3750 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3752 - .catch Ljava/lang/Throwable; {:try_start_2bf .. :try_end_2c6} :catch_a27
3754 + .catch Ljava/lang/Throwable; {:try_start_2c4 .. :try_end_2cb} :catch_a2c
3756 move-object/from16 v61, v62
3762 const-string v3, "SystemServer"
3764 const-string v9, "Status Bar"
3765 @@ -881,22 +920,22 @@
3766 move-object/from16 v1, v120
3768 invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3770 - .catch Ljava/lang/Throwable; {:try_start_2c8 .. :try_end_2d8} :catch_7c3
3772 + .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2dd} :catch_7c8
3776 const-string v3, "statusbar"
3778 move-object/from16 v0, v102
3780 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3782 - .catch Ljava/lang/Throwable; {:try_start_2d8 .. :try_end_2df} :catch_a22
3784 + .catch Ljava/lang/Throwable; {:try_start_2dd .. :try_end_2e4} :catch_a27
3786 move-object/from16 v101, v102
3792 const-string v3, "SystemServer"
3794 const-string v9, "Clipboard Service"
3795 @@ -910,11 +949,11 @@
3796 invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
3798 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3800 - .catch Ljava/lang/Throwable; {:try_start_2e1 .. :try_end_2f2} :catch_7cf
3802 + .catch Ljava/lang/Throwable; {:try_start_2e6 .. :try_end_2f7} :catch_7d4
3808 const-string v3, "SystemServer"
3810 const-string v9, "NetworkManagement Service"
3811 @@ -928,11 +967,11 @@
3812 const-string v3, "network_management"
3814 invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3816 - .catch Ljava/lang/Throwable; {:try_start_2f2 .. :try_end_302} :catch_7db
3818 + .catch Ljava/lang/Throwable; {:try_start_2f7 .. :try_end_307} :catch_7e0
3824 const-string v3, "SystemServer"
3826 const-string v9, "Text Service Manager Service"
3827 @@ -944,22 +983,22 @@
3828 move-object/from16 v0, v106
3830 invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3832 - .catch Ljava/lang/Throwable; {:try_start_302 .. :try_end_310} :catch_7e7
3834 + .catch Ljava/lang/Throwable; {:try_start_307 .. :try_end_315} :catch_7ec
3838 const-string v3, "textservices"
3840 move-object/from16 v0, v106
3842 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3844 - .catch Ljava/lang/Throwable; {:try_start_310 .. :try_end_317} :catch_a1d
3846 + .catch Ljava/lang/Throwable; {:try_start_315 .. :try_end_31c} :catch_a22
3848 move-object/from16 v105, v106
3854 const-string v3, "SystemServer"
3856 const-string v9, "NetworkStats Service"
3857 @@ -971,22 +1010,22 @@
3858 move-object/from16 v0, v85
3860 invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
3862 - .catch Ljava/lang/Throwable; {:try_start_319 .. :try_end_327} :catch_7f3
3864 + .catch Ljava/lang/Throwable; {:try_start_31e .. :try_end_32c} :catch_7f8
3868 const-string v3, "netstats"
3870 move-object/from16 v0, v85
3872 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3874 - .catch Ljava/lang/Throwable; {:try_start_327 .. :try_end_32e} :catch_a18
3876 + .catch Ljava/lang/Throwable; {:try_start_32c .. :try_end_333} :catch_a1d
3878 move-object/from16 v12, v85
3884 const-string v3, "SystemServer"
3886 const-string v9, "NetworkPolicy Service"
3887 @@ -1004,18 +1043,18 @@
3890 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
3892 - .catch Ljava/lang/Throwable; {:try_start_330 .. :try_end_342} :catch_7ff
3894 + .catch Ljava/lang/Throwable; {:try_start_335 .. :try_end_347} :catch_804
3898 const-string v3, "netpolicy"
3900 invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3902 - .catch Ljava/lang/Throwable; {:try_start_342 .. :try_end_347} :catch_a15
3904 + .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_34c} :catch_a1a
3910 const-string v3, "SystemServer"
3912 const-string v9, "Wi-Fi P2pService"
3913 @@ -1027,22 +1066,22 @@
3914 move-object/from16 v0, v119
3916 invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3918 - .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_355} :catch_80d
3920 + .catch Ljava/lang/Throwable; {:try_start_34c .. :try_end_35a} :catch_812
3924 const-string v3, "wifip2p"
3926 move-object/from16 v0, v119
3928 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3930 - .catch Ljava/lang/Throwable; {:try_start_355 .. :try_end_35c} :catch_a10
3932 + .catch Ljava/lang/Throwable; {:try_start_35a .. :try_end_361} :catch_a15
3934 move-object/from16 v118, v119
3940 const-string v3, "SystemServer"
3942 const-string v9, "Wi-Fi Service"
3943 @@ -1054,22 +1093,22 @@
3944 move-object/from16 v0, v117
3946 invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3948 - .catch Ljava/lang/Throwable; {:try_start_35e .. :try_end_36c} :catch_819
3950 + .catch Ljava/lang/Throwable; {:try_start_363 .. :try_end_371} :catch_81e
3954 const-string v3, "wifi"
3956 move-object/from16 v0, v117
3958 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3960 - .catch Ljava/lang/Throwable; {:try_start_36c .. :try_end_373} :catch_a0b
3962 + .catch Ljava/lang/Throwable; {:try_start_371 .. :try_end_378} :catch_a10
3964 move-object/from16 v116, v117
3970 const-string v3, "SystemServer"
3972 const-string v9, "Connectivity Service"
3973 @@ -1081,10 +1120,10 @@
3974 move-object/from16 v0, v56
3976 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
3978 - .catch Ljava/lang/Throwable; {:try_start_375 .. :try_end_383} :catch_825
3980 + .catch Ljava/lang/Throwable; {:try_start_37a .. :try_end_388} :catch_82a
3984 const-string v3, "connectivity"
3986 move-object/from16 v0, v56
3987 @@ -1102,13 +1141,13 @@
3988 invoke-virtual/range {v116 .. v116}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3990 invoke-virtual/range {v118 .. v118}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3992 - .catch Ljava/lang/Throwable; {:try_start_383 .. :try_end_39a} :catch_a06
3994 + .catch Ljava/lang/Throwable; {:try_start_388 .. :try_end_39f} :catch_a0b
3996 move-object/from16 v55, v56
4002 const-string v3, "SystemServer"
4004 const-string v9, "Network Service Discovery Service"
4005 @@ -1124,11 +1163,11 @@
4006 move-object/from16 v0, v99
4008 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4010 - .catch Ljava/lang/Throwable; {:try_start_39c .. :try_end_3ae} :catch_831
4012 + .catch Ljava/lang/Throwable; {:try_start_3a1 .. :try_end_3b3} :catch_836
4018 const-string v3, "SystemServer"
4020 const-string v9, "Throttle Service"
4021 @@ -1140,22 +1179,22 @@
4022 move-object/from16 v0, v104
4024 invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4026 - .catch Ljava/lang/Throwable; {:try_start_3ae .. :try_end_3bc} :catch_83d
4028 + .catch Ljava/lang/Throwable; {:try_start_3b3 .. :try_end_3c1} :catch_842
4032 const-string v3, "throttle"
4034 move-object/from16 v0, v104
4036 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4038 - .catch Ljava/lang/Throwable; {:try_start_3bc .. :try_end_3c3} :catch_a01
4040 + .catch Ljava/lang/Throwable; {:try_start_3c1 .. :try_end_3c8} :catch_a06
4042 move-object/from16 v103, v104
4048 const-string v3, "SystemServer"
4050 const-string v9, "UpdateLock Service"
4051 @@ -1169,34 +1208,34 @@
4052 invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
4054 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4056 - .catch Ljava/lang/Throwable; {:try_start_3c5 .. :try_end_3d6} :catch_849
4058 + .catch Ljava/lang/Throwable; {:try_start_3ca .. :try_end_3db} :catch_84e
4061 - if-eqz v82, :cond_3db
4063 + if-eqz v82, :cond_3e0
4065 invoke-virtual/range {v82 .. v82}, Lcom/android/server/MountService;->waitForAsecScan()V
4068 - if-eqz v41, :cond_3e0
4071 - invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4073 - .catch Ljava/lang/Throwable; {:try_start_3dd .. :try_end_3e0} :catch_855
4077 - if-eqz v57, :cond_3e5
4078 + if-eqz v41, :cond_3e5
4081 - invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4082 + invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4084 - .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_861
4085 + .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_85a
4090 + if-eqz v57, :cond_3ea
4093 + invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4095 + .catch Ljava/lang/Throwable; {:try_start_3e7 .. :try_end_3ea} :catch_866
4100 const-string v3, "SystemServer"
4102 const-string v9, "Notification Manager"
4103 @@ -1212,10 +1251,10 @@
4104 move-object/from16 v2, v75
4106 invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4108 - .catch Ljava/lang/Throwable; {:try_start_3e5 .. :try_end_3f7} :catch_86d
4110 + .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3fc} :catch_872
4114 const-string v3, "notification"
4116 move-object/from16 v0, v89
4117 @@ -1225,13 +1264,13 @@
4118 move-object/from16 v0, v89
4120 invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4122 - .catch Ljava/lang/Throwable; {:try_start_3f7 .. :try_end_403} :catch_9fc
4124 + .catch Ljava/lang/Throwable; {:try_start_3fc .. :try_end_408} :catch_a01
4126 move-object/from16 v88, v89
4132 const-string v3, "SystemServer"
4134 const-string v9, "Device Storage Monitor"
4135 @@ -1245,11 +1284,11 @@
4136 invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4138 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4140 - .catch Ljava/lang/Throwable; {:try_start_405 .. :try_end_416} :catch_879
4142 + .catch Ljava/lang/Throwable; {:try_start_40a .. :try_end_41b} :catch_87e
4148 const-string v3, "SystemServer"
4150 const-string v9, "Location Manager"
4151 @@ -1261,22 +1300,22 @@
4152 move-object/from16 v0, v78
4154 invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4156 - .catch Ljava/lang/Throwable; {:try_start_416 .. :try_end_424} :catch_885
4158 + .catch Ljava/lang/Throwable; {:try_start_41b .. :try_end_429} :catch_88a
4162 const-string v3, "location"
4164 move-object/from16 v0, v78
4166 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4168 - .catch Ljava/lang/Throwable; {:try_start_424 .. :try_end_42b} :catch_9f7
4170 + .catch Ljava/lang/Throwable; {:try_start_429 .. :try_end_430} :catch_9fc
4172 move-object/from16 v77, v78
4178 const-string v3, "SystemServer"
4180 const-string v9, "Country Detector"
4181 @@ -1288,22 +1327,22 @@
4182 move-object/from16 v0, v59
4184 invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4186 - .catch Ljava/lang/Throwable; {:try_start_42d .. :try_end_43b} :catch_891
4188 + .catch Ljava/lang/Throwable; {:try_start_432 .. :try_end_440} :catch_896
4192 const-string v3, "country_detector"
4194 move-object/from16 v0, v59
4196 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4198 - .catch Ljava/lang/Throwable; {:try_start_43b .. :try_end_442} :catch_9f2
4200 + .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_447} :catch_9f7
4202 move-object/from16 v58, v59
4208 const-string v3, "SystemServer"
4210 const-string v9, "Search Service"
4211 @@ -1317,11 +1356,11 @@
4212 invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4214 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4216 - .catch Ljava/lang/Throwable; {:try_start_444 .. :try_end_455} :catch_89d
4218 + .catch Ljava/lang/Throwable; {:try_start_449 .. :try_end_45a} :catch_8a2
4224 const-string v3, "SystemServer"
4226 const-string v9, "DropBox Service"
4227 @@ -1341,10 +1380,10 @@
4228 invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4230 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4232 - .catch Ljava/lang/Throwable; {:try_start_455 .. :try_end_46d} :catch_8a9
4234 + .catch Ljava/lang/Throwable; {:try_start_45a .. :try_end_472} :catch_8ae
4238 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4240 move-result-object v3
4241 @@ -1355,38 +1394,38 @@
4245 - if-eqz v3, :cond_493
4246 + if-eqz v3, :cond_498
4250 const-string v3, "SystemServer"
4252 const-string v9, "Wallpaper Service"
4254 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4256 - if-nez v16, :cond_493
4257 + if-nez v16, :cond_498
4259 new-instance v115, Lcom/android/server/WallpaperManagerService;
4261 move-object/from16 v0, v115
4263 invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4265 - .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_48a} :catch_8b5
4267 + .catch Ljava/lang/Throwable; {:try_start_47f .. :try_end_48f} :catch_8ba
4271 const-string v3, "wallpaper"
4273 move-object/from16 v0, v115
4275 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4277 - .catch Ljava/lang/Throwable; {:try_start_48a .. :try_end_491} :catch_9ed
4279 + .catch Ljava/lang/Throwable; {:try_start_48f .. :try_end_496} :catch_9f2
4281 move-object/from16 v114, v115
4287 const-string v3, "0"
4289 const-string v9, "system_init.startaudioservice"
4290 @@ -1399,9 +1438,9 @@
4294 - if-nez v3, :cond_4b2
4295 + if-nez v3, :cond_4b7
4299 const-string v3, "SystemServer"
4301 const-string v9, "Audio Service"
4302 @@ -1415,12 +1454,12 @@
4303 invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4305 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4307 - .catch Ljava/lang/Throwable; {:try_start_4a1 .. :try_end_4b2} :catch_8c1
4309 + .catch Ljava/lang/Throwable; {:try_start_4a6 .. :try_end_4b7} :catch_8c6
4317 const-string v3, "SystemServer"
4319 const-string v9, "Dock Observer"
4320 @@ -1432,13 +1471,13 @@
4321 move-object/from16 v0, v64
4323 invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4325 - .catch Ljava/lang/Throwable; {:try_start_4b2 .. :try_end_4c0} :catch_8cd
4327 + .catch Ljava/lang/Throwable; {:try_start_4b7 .. :try_end_4c5} :catch_8d2
4329 move-object/from16 v63, v64
4335 const-string v3, "SystemServer"
4337 const-string v9, "Wired Accessory Observer"
4338 @@ -1448,11 +1487,11 @@
4339 new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4341 invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4343 - .catch Ljava/lang/Throwable; {:try_start_4c2 .. :try_end_4ce} :catch_8d9
4345 + .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d3} :catch_8de
4351 const-string v3, "SystemServer"
4353 const-string v9, "USB Service"
4354 @@ -1464,22 +1503,22 @@
4355 move-object/from16 v0, v110
4357 invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4359 - .catch Ljava/lang/Throwable; {:try_start_4ce .. :try_end_4dc} :catch_8e5
4361 + .catch Ljava/lang/Throwable; {:try_start_4d3 .. :try_end_4e1} :catch_8ea
4365 const-string v3, "usb"
4367 move-object/from16 v0, v110
4369 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4371 - .catch Ljava/lang/Throwable; {:try_start_4dc .. :try_end_4e3} :catch_9e8
4373 + .catch Ljava/lang/Throwable; {:try_start_4e1 .. :try_end_4e8} :catch_9ed
4375 move-object/from16 v109, v110
4381 const-string v3, "SystemServer"
4383 const-string v9, "Serial Service"
4384 @@ -1491,22 +1530,22 @@
4385 move-object/from16 v0, v98
4387 invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4389 - .catch Ljava/lang/Throwable; {:try_start_4e5 .. :try_end_4f3} :catch_8f1
4391 + .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_8f6
4395 const-string v3, "serial"
4397 move-object/from16 v0, v98
4399 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4401 - .catch Ljava/lang/Throwable; {:try_start_4f3 .. :try_end_4fa} :catch_9e3
4403 + .catch Ljava/lang/Throwable; {:try_start_4f8 .. :try_end_4ff} :catch_9e8
4405 move-object/from16 v97, v98
4411 const-string v3, "SystemServer"
4413 const-string v9, "UI Mode Manager Service"
4414 @@ -1518,13 +1557,13 @@
4415 move-object/from16 v0, v108
4417 invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4419 - .catch Ljava/lang/Throwable; {:try_start_4fc .. :try_end_50a} :catch_8fd
4421 + .catch Ljava/lang/Throwable; {:try_start_501 .. :try_end_50f} :catch_902
4423 move-object/from16 v107, v108
4429 const-string v3, "SystemServer"
4431 const-string v9, "Backup Service"
4432 @@ -1538,11 +1577,11 @@
4433 invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4435 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4437 - .catch Ljava/lang/Throwable; {:try_start_50c .. :try_end_51d} :catch_909
4439 + .catch Ljava/lang/Throwable; {:try_start_511 .. :try_end_522} :catch_90e
4445 const-string v3, "SystemServer"
4447 const-string v9, "AppWidget Service"
4448 @@ -1554,22 +1593,22 @@
4449 move-object/from16 v0, v45
4451 invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4453 - .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_915
4455 + .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_91a
4459 const-string v3, "appwidget"
4461 move-object/from16 v0, v45
4463 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4465 - .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_9de
4467 + .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_9e3
4469 move-object/from16 v44, v45
4475 const-string v3, "SystemServer"
4477 const-string v9, "Recognition Service"
4478 @@ -1581,13 +1620,13 @@
4479 move-object/from16 v0, v96
4481 invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4483 - .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_921
4485 + .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_926
4487 move-object/from16 v95, v96
4493 const-string v3, "SystemServer"
4495 const-string v9, "DiskStats Service"
4496 @@ -1601,11 +1640,11 @@
4497 invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4499 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4501 - .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_92d
4503 + .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_932
4509 const-string v3, "SystemServer"
4511 const-string v9, "SamplingProfiler Service"
4512 @@ -1619,11 +1658,11 @@
4513 invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4515 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4517 - .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_566} :catch_939
4519 + .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_56b} :catch_93e
4525 const-string v3, "SystemServer"
4527 const-string v9, "NetworkTimeUpdateService"
4528 @@ -1635,13 +1674,13 @@
4529 move-object/from16 v0, v87
4531 invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4533 - .catch Ljava/lang/Throwable; {:try_start_566 .. :try_end_574} :catch_945
4535 + .catch Ljava/lang/Throwable; {:try_start_56b .. :try_end_579} :catch_94a
4537 move-object/from16 v86, v87
4543 const-string v3, "SystemServer"
4545 const-string v9, "CommonTimeManagementService"
4546 @@ -1653,22 +1692,22 @@
4547 move-object/from16 v0, v53
4549 invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4551 - .catch Ljava/lang/Throwable; {:try_start_576 .. :try_end_584} :catch_951
4553 + .catch Ljava/lang/Throwable; {:try_start_57b .. :try_end_589} :catch_956
4557 const-string v3, "commontime_management"
4559 move-object/from16 v0, v53
4561 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4563 - .catch Ljava/lang/Throwable; {:try_start_584 .. :try_end_58b} :catch_9d9
4565 + .catch Ljava/lang/Throwable; {:try_start_589 .. :try_end_590} :catch_9de
4567 move-object/from16 v52, v53
4573 const-string v3, "SystemServer"
4575 const-string v9, "CertBlacklister"
4576 @@ -1678,10 +1717,10 @@
4577 new-instance v3, Lcom/android/server/CertBlacklister;
4579 invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4581 - .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_599} :catch_95d
4583 + .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_59e} :catch_962
4587 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4589 move-result-object v3
4590 @@ -1692,9 +1731,9 @@
4594 - if-eqz v3, :cond_5bd
4595 + if-eqz v3, :cond_5c2
4599 const-string v3, "SystemServer"
4601 const-string v9, "Dreams Service"
4602 @@ -1706,23 +1745,23 @@
4603 move-object/from16 v0, v66
4605 invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4607 - .catch Ljava/lang/Throwable; {:try_start_5a6 .. :try_end_5b4} :catch_969
4609 + .catch Ljava/lang/Throwable; {:try_start_5ab .. :try_end_5b9} :catch_96e
4613 const-string v3, "dreams"
4615 move-object/from16 v0, v66
4617 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4619 - .catch Ljava/lang/Throwable; {:try_start_5b4 .. :try_end_5bb} :catch_9d5
4621 + .catch Ljava/lang/Throwable; {:try_start_5b9 .. :try_end_5c0} :catch_9da
4623 move-object/from16 v65, v66
4631 const-string v3, "SystemServer"
4633 const-string v9, "AssetRedirectionManager Service"
4634 @@ -1736,15 +1775,15 @@
4635 invoke-direct {v9, v4}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
4637 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4639 - .catch Ljava/lang/Throwable; {:try_start_5bd .. :try_end_5ce} :catch_975
4641 + .catch Ljava/lang/Throwable; {:try_start_5c2 .. :try_end_5d3} :catch_97a
4645 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
4649 - if-eqz v28, :cond_981
4650 + if-eqz v28, :cond_986
4652 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4654 @@ -1762,38 +1801,38 @@
4656 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4660 - invoke-virtual/range {v111 .. v111}, Lcom/android/server/VibratorService;->systemReady()V
4662 - .catch Ljava/lang/Throwable; {:try_start_5e5 .. :try_end_5e8} :catch_98a
4665 - if-eqz v61, :cond_5ed
4669 - invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4670 + invoke-virtual/range {v111 .. v111}, Lcom/android/server/VibratorService;->systemReady()V
4672 - .catch Ljava/lang/Throwable; {:try_start_5ea .. :try_end_5ed} :catch_996
4673 + .catch Ljava/lang/Throwable; {:try_start_5ea .. :try_end_5ed} :catch_98f
4677 - if-eqz v88, :cond_5f2
4678 + if-eqz v61, :cond_5f2
4681 - invoke-virtual/range {v88 .. v88}, Lcom/android/server/NotificationManagerService;->systemReady()V
4682 + invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4684 - .catch Ljava/lang/Throwable; {:try_start_5ef .. :try_end_5f2} :catch_9a2
4685 + .catch Ljava/lang/Throwable; {:try_start_5ef .. :try_end_5f2} :catch_99b
4690 + if-eqz v88, :cond_5f7
4693 + invoke-virtual/range {v88 .. v88}, Lcom/android/server/NotificationManagerService;->systemReady()V
4695 + .catch Ljava/lang/Throwable; {:try_start_5f4 .. :try_end_5f7} :catch_9a7
4700 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4702 - .catch Ljava/lang/Throwable; {:try_start_5f2 .. :try_end_5f5} :catch_9ae
4704 + .catch Ljava/lang/Throwable; {:try_start_5f7 .. :try_end_5fa} :catch_9b3
4707 - if-eqz v28, :cond_5fe
4709 + if-eqz v28, :cond_603
4711 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4713 @@ -1801,7 +1840,7 @@
4715 invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4719 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4721 move-result-object v54
4722 @@ -1838,18 +1877,18 @@
4724 invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4728 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->systemReady()V
4730 - .catch Ljava/lang/Throwable; {:try_start_626 .. :try_end_629} :catch_9ba
4732 + .catch Ljava/lang/Throwable; {:try_start_62b .. :try_end_62e} :catch_9bf
4738 invoke-virtual/range {v79 .. v79}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4740 - .catch Ljava/lang/Throwable; {:try_start_629 .. :try_end_62c} :catch_9c6
4742 + .catch Ljava/lang/Throwable; {:try_start_62e .. :try_end_631} :catch_9cb
4746 new-instance v70, Landroid/content/IntentFilter;
4748 invoke-direct/range {v70 .. v70}, Landroid/content/IntentFilter;-><init>()V
4749 @@ -1960,7 +1999,7 @@
4753 - if-eqz v3, :cond_6ae
4754 + if-eqz v3, :cond_6b3
4756 const-string v3, "SystemServer"
4758 @@ -1968,7 +2007,7 @@
4760 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4764 invoke-static {}, Landroid/os/Looper;->loop()V
4766 const-string v3, "SystemServer"
4767 @@ -1979,25 +2018,25 @@
4785 invoke-static/range {v69 .. v69}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4795 const-string v3, "1"
4797 move-object/from16 v0, v60
4798 @@ -2018,15 +2057,15 @@
4814 const-string v3, "SystemServer"
4816 const-string v9, "Failure starting Account Manager"
4817 @@ -2034,19 +2073,19 @@
4818 move-object/from16 v0, v67
4820 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4822 - .catch Ljava/lang/RuntimeException; {:try_start_6c7 .. :try_end_6e9} :catch_6eb
4824 + .catch Ljava/lang/RuntimeException; {:try_start_6cc .. :try_end_6ee} :catch_6f0
4832 move-object/from16 v7, v43
4834 move-object/from16 v5, v46
4838 const-string v3, "System"
4840 const-string v9, "******************************************"
4841 @@ -2061,51 +2100,51 @@
4843 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4876 - if-ne v0, v3, :cond_720
4877 + if-ne v0, v3, :cond_725
4881 const-string v3, "SystemServer"
4883 const-string v9, "No Bluetooth Service (factory test)"
4885 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4894 move-object/from16 v111, v112
4896 move-object/from16 v75, v76
4903 const-string v3, "SystemServer"
4905 const-string v9, "Bluetooth Service"
4906 @@ -2117,10 +2156,10 @@
4907 move-object/from16 v0, v48
4909 invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4911 - .catch Ljava/lang/RuntimeException; {:try_start_711 .. :try_end_72e} :catch_71a
4913 + .catch Ljava/lang/RuntimeException; {:try_start_716 .. :try_end_733} :catch_71f
4917 const-string v3, "bluetooth"
4919 move-object/from16 v0, v48
4920 @@ -2141,7 +2180,7 @@
4924 - if-nez v3, :cond_75b
4925 + if-nez v3, :cond_760
4927 new-instance v50, Landroid/server/BluetoothA2dpService;
4929 @@ -2150,10 +2189,10 @@
4930 move-object/from16 v1, v48
4932 invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4934 - .catch Ljava/lang/RuntimeException; {:try_start_72e .. :try_end_74f} :catch_a69
4936 + .catch Ljava/lang/RuntimeException; {:try_start_733 .. :try_end_754} :catch_a6e
4940 const-string v3, "bluetooth_a2dp"
4942 move-object/from16 v0, v50
4943 @@ -2161,13 +2200,13 @@
4944 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4946 invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
4948 - .catch Ljava/lang/RuntimeException; {:try_start_74f .. :try_end_759} :catch_a72
4950 + .catch Ljava/lang/RuntimeException; {:try_start_754 .. :try_end_75e} :catch_a77
4952 move-object/from16 v49, v50
4958 move-object/from16 v0, p0
4960 iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4961 @@ -2180,21 +2219,21 @@
4965 - if-eqz v51, :cond_76b
4966 + if-eqz v51, :cond_770
4968 invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->enable()Z
4970 - .catch Ljava/lang/RuntimeException; {:try_start_75b .. :try_end_76b} :catch_a69
4972 + .catch Ljava/lang/RuntimeException; {:try_start_760 .. :try_end_770} :catch_a6e
4976 move-object/from16 v47, v48
4987 const-string v3, "starting Input Manager Service"
4989 move-object/from16 v0, p0
4990 @@ -2203,9 +2242,9 @@
4992 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5001 const-string v3, "starting Accessibility Manager"
5002 @@ -2216,9 +2255,9 @@
5004 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5013 const-string v3, "making display ready"
5014 @@ -2229,9 +2268,9 @@
5016 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5025 const-string v3, "performing boot dexopt"
5026 @@ -2242,12 +2281,12 @@
5028 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5039 const-string v3, "starting Mount Service"
5041 move-object/from16 v0, p0
5042 @@ -2256,12 +2295,12 @@
5044 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5055 const-string v3, "starting LockSettingsService service"
5057 move-object/from16 v0, p0
5058 @@ -2270,12 +2309,12 @@
5060 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5071 const-string v3, "starting DevicePolicyService"
5073 move-object/from16 v0, p0
5074 @@ -2284,12 +2323,12 @@
5076 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5087 const-string v3, "starting StatusBarManagerService"
5089 move-object/from16 v0, p0
5090 @@ -2298,9 +2337,9 @@
5092 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5101 const-string v3, "starting Clipboard Service"
5102 @@ -2311,9 +2350,9 @@
5104 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5113 const-string v3, "starting NetworkManagement Service"
5114 @@ -2324,12 +2363,12 @@
5116 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5127 const-string v3, "starting Text Service Manager Service"
5129 move-object/from16 v0, p0
5130 @@ -2338,12 +2377,12 @@
5132 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5143 const-string v3, "starting NetworkStats Service"
5145 move-object/from16 v0, p0
5146 @@ -2352,14 +2391,14 @@
5148 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5157 move-object/from16 v8, v84
5161 const-string v3, "starting NetworkPolicy Service"
5163 move-object/from16 v0, p0
5164 @@ -2368,12 +2407,12 @@
5166 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5177 const-string v3, "starting Wi-Fi P2pService"
5179 move-object/from16 v0, p0
5180 @@ -2382,12 +2421,12 @@
5182 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5193 const-string v3, "starting Wi-Fi Service"
5195 move-object/from16 v0, p0
5196 @@ -2396,12 +2435,12 @@
5198 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5209 const-string v3, "starting Connectivity Service"
5211 move-object/from16 v0, p0
5212 @@ -2410,9 +2449,9 @@
5214 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5223 const-string v3, "starting Service Discovery Service"
5224 @@ -2423,12 +2462,12 @@
5226 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5237 const-string v3, "starting ThrottleService"
5239 move-object/from16 v0, p0
5240 @@ -2437,9 +2476,9 @@
5242 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5251 const-string v3, "starting UpdateLockService"
5252 @@ -2450,9 +2489,9 @@
5254 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5263 const-string v3, "making Account Manager Service ready"
5264 @@ -2463,9 +2502,9 @@
5266 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5275 const-string v3, "making Content Service ready"
5276 @@ -2476,12 +2515,12 @@
5278 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5289 const-string v3, "starting Notification Manager"
5291 move-object/from16 v0, p0
5292 @@ -2490,9 +2529,9 @@
5294 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5303 const-string v3, "starting DeviceStorageMonitor service"
5304 @@ -2503,12 +2542,12 @@
5306 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5317 const-string v3, "starting Location Manager"
5319 move-object/from16 v0, p0
5320 @@ -2517,12 +2556,12 @@
5322 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5333 const-string v3, "starting Country Detector"
5335 move-object/from16 v0, p0
5336 @@ -2531,9 +2570,9 @@
5338 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5347 const-string v3, "starting Search Service"
5348 @@ -2544,9 +2583,9 @@
5350 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5359 const-string v3, "starting DropBoxManagerService"
5360 @@ -2557,12 +2596,12 @@
5362 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5373 const-string v3, "starting Wallpaper Service"
5375 move-object/from16 v0, p0
5376 @@ -2571,9 +2610,9 @@
5378 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5387 const-string v3, "starting Audio Service"
5388 @@ -2584,9 +2623,9 @@
5390 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5399 const-string v3, "starting DockObserver"
5400 @@ -2597,9 +2636,9 @@
5402 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5411 const-string v3, "starting WiredAccessoryObserver"
5412 @@ -2610,12 +2649,12 @@
5414 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5425 const-string v3, "starting UsbService"
5427 move-object/from16 v0, p0
5428 @@ -2624,12 +2663,12 @@
5430 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5441 const-string v3, "SystemServer"
5443 const-string v9, "Failure starting SerialService"
5444 @@ -2638,9 +2677,9 @@
5446 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5455 const-string v3, "starting UiModeManagerService"
5456 @@ -2651,9 +2690,9 @@
5458 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5467 const-string v3, "SystemServer"
5468 @@ -2664,12 +2703,12 @@
5470 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5481 const-string v3, "starting AppWidget Service"
5483 move-object/from16 v0, p0
5484 @@ -2678,9 +2717,9 @@
5486 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5495 const-string v3, "starting Recognition Service"
5496 @@ -2691,9 +2730,9 @@
5498 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5507 const-string v3, "starting DiskStats Service"
5508 @@ -2704,9 +2743,9 @@
5510 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5519 const-string v3, "starting SamplingProfiler Service"
5520 @@ -2717,9 +2756,9 @@
5522 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5531 const-string v3, "starting NetworkTimeUpdate service"
5532 @@ -2730,12 +2769,12 @@
5534 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5545 const-string v3, "starting CommonTimeManagementService service"
5547 move-object/from16 v0, p0
5548 @@ -2744,9 +2783,9 @@
5550 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5559 const-string v3, "starting CertBlacklister"
5560 @@ -2757,12 +2796,12 @@
5562 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5573 const-string v3, "starting DreamManagerService"
5575 move-object/from16 v0, p0
5576 @@ -2771,9 +2810,9 @@
5578 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5587 const-string v3, "SystemServer"
5588 @@ -2784,18 +2823,18 @@
5590 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5597 invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5599 move-result-object v3
5601 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5610 const-string v3, "making Vibrator Service ready"
5611 @@ -2806,9 +2845,9 @@
5613 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5622 const-string v3, "making Device Policy Service ready"
5623 @@ -2819,9 +2858,9 @@
5625 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5634 const-string v3, "making Notification Service ready"
5635 @@ -2832,9 +2871,9 @@
5637 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5646 const-string v3, "making Window Manager Service ready"
5647 @@ -2845,9 +2884,9 @@
5649 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5658 const-string v3, "making Package Manager Service ready"
5659 @@ -2858,9 +2897,9 @@
5661 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5670 const-string v3, "making Lock Settings Service ready"
5671 @@ -2871,164 +2910,164 @@
5673 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5688 move-object/from16 v65, v66
5697 move-object/from16 v52, v53
5706 move-object/from16 v44, v45
5715 move-object/from16 v97, v98
5724 move-object/from16 v109, v110
5733 move-object/from16 v114, v115
5742 move-object/from16 v58, v59
5751 move-object/from16 v77, v78
5760 move-object/from16 v88, v89
5769 move-object/from16 v103, v104
5778 move-object/from16 v55, v56
5787 move-object/from16 v116, v117
5796 move-object/from16 v118, v119
5812 move-object/from16 v12, v85
5821 move-object/from16 v105, v106
5830 move-object/from16 v101, v102
5839 move-object/from16 v61, v62
5848 move-object/from16 v79, v80
5857 move-object/from16 v82, v83
5873 move-object/from16 v72, v73
5882 move-object/from16 v7, v43
5883 @@ -3037,9 +3076,9 @@
5885 move-object/from16 v6, v92
5894 move-object/from16 v7, v43
5895 @@ -3048,9 +3087,9 @@
5897 move-object/from16 v41, v42
5906 move-object/from16 v7, v43
5907 @@ -3059,18 +3098,18 @@
5909 move-object/from16 v75, v76
5918 move-object/from16 v7, v43
5920 move-object/from16 v75, v76
5929 move-object/from16 v7, v43
5930 @@ -3079,9 +3118,9 @@
5932 move-object/from16 v75, v76
5941 move-object/from16 v47, v48
5942 @@ -3090,9 +3129,9 @@
5944 move-object/from16 v75, v76
5953 move-object/from16 v49, v50
5954 @@ -3103,17 +3142,17 @@
5956 move-object/from16 v75, v76
5965 move-object/from16 v41, v42
5972 move-object/from16 v8, v84
5977 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali ext-services/smali/com/android/server/TelephonyRegistry$1.smali
5978 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali 2012-11-08 09:10:55.830540649 -0600
5979 +++ ext-services/smali/com/android/server/TelephonyRegistry$1.smali 1969-12-31 18:00:00.000000000 -0600
5981 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
5982 -.super Ljava/lang/Object;
5983 -.source "TelephonyRegistry.java"
5987 -.annotation system Ldalvik/annotation/EnclosingClass;
5988 - value = Lcom/android/server/TelephonyRegistry;
5991 -.annotation system Ldalvik/annotation/InnerClass;
5992 - accessFlags = 0x1008
5995 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali ext-services/smali/com/android/server/TelephonyRegistry$Record.smali
5996 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-11-08 09:10:55.830540649 -0600
5997 +++ ext-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-11-08 09:11:28.554702935 -0600
5999 -.class Lcom/android/server/TelephonyRegistry$Record;
6000 +.class public Lcom/android/server/TelephonyRegistry$Record;
6001 .super Ljava/lang/Object;
6002 .source "TelephonyRegistry.java"
6007 .annotation system Ldalvik/annotation/InnerClass;
6017 -.method private constructor <init>()V
6018 +.method public constructor <init>()V
6021 invoke-direct {p0}, Ljava/lang/Object;-><init>()V
6026 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
6029 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6033 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali ext-services/smali/com/android/server/TelephonyRegistry.smali
6034 --- stock-services/smali/com/android/server/TelephonyRegistry.smali 2012-11-08 09:10:55.850540763 -0600
6035 +++ ext-services/smali/com/android/server/TelephonyRegistry.smali 2012-11-08 09:11:28.438702352 -0600
6038 .annotation system Ldalvik/annotation/MemberClasses;
6040 - Lcom/android/server/TelephonyRegistry$1;,
6041 Lcom/android/server/TelephonyRegistry$Record;
6046 .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6048 -.field private mCallForwarding:Z
6049 +.field protected mCallForwarding:Z
6051 -.field private mCallIncomingNumber:Ljava/lang/String;
6052 +.field protected mCallIncomingNumber:Ljava/lang/String;
6054 -.field private mCallState:I
6055 +.field protected mCallState:I
6057 -.field private mCellInfo:Landroid/telephony/CellInfo;
6058 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6060 -.field private mCellLocation:Landroid/os/Bundle;
6061 +.field protected mCellLocation:Landroid/os/Bundle;
6063 .field private mConnectedApns:Ljava/util/ArrayList;
6064 .annotation system Ldalvik/annotation/Signature;
6069 -.field private final mContext:Landroid/content/Context;
6070 +.field protected final mContext:Landroid/content/Context;
6072 -.field private mDataActivity:I
6073 +.field protected mDataActivity:I
6075 .field private mDataConnectionApn:Ljava/lang/String;
6079 .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6081 -.field private mDataConnectionNetworkType:I
6082 +.field protected mDataConnectionNetworkType:I
6084 .field private mDataConnectionPossible:Z
6086 .field private mDataConnectionReason:Ljava/lang/String;
6088 -.field private mDataConnectionState:I
6089 +.field protected mDataConnectionState:I
6091 -.field private mMessageWaiting:Z
6092 +.field protected mMessageWaiting:Z
6094 -.field private mOtaspMode:I
6095 +.field protected mOtaspMode:I
6097 -.field private final mRecords:Ljava/util/ArrayList;
6098 +.field protected final mRecords:Ljava/util/ArrayList;
6099 .annotation system Ldalvik/annotation/Signature;
6101 "Ljava/util/ArrayList",
6106 -.field private final mRemoveList:Ljava/util/ArrayList;
6107 +.field protected final mRemoveList:Ljava/util/ArrayList;
6108 .annotation system Ldalvik/annotation/Signature;
6110 "Ljava/util/ArrayList",
6115 -.field private mServiceState:Landroid/telephony/ServiceState;
6116 +.field protected mServiceState:Landroid/telephony/ServiceState;
6118 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6119 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6123 -.method constructor <init>(Landroid/content/Context;)V
6124 +.method protected constructor <init>(Landroid/content/Context;)V
6132 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6134 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6137 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6139 @@ -391,29 +390,29 @@
6141 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6143 - invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6147 - invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6149 - .catchall {:try_start_4 .. :try_end_d} :catchall_28
6150 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6151 + invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6153 + .catchall {:try_start_4 .. :try_end_9} :catchall_29
6154 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6158 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6160 new-instance v3, Landroid/content/Intent;
6162 - const-string v4, "android.intent.action.SERVICE_STATE"
6163 + const-string v4, "android.intent.action.SIG_STR"
6165 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6167 + const/high16 v4, 0x2000
6169 + invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6171 new-instance v0, Landroid/os/Bundle;
6173 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6175 - invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6176 + invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6178 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6180 @@ -423,21 +422,23 @@
6188 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6200 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6204 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6207 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6209 @@ -446,29 +447,29 @@
6211 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6213 - invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6215 - .catchall {:try_start_4 .. :try_end_9} :catchall_29
6216 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6217 + invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6222 + invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6224 + .catchall {:try_start_4 .. :try_end_d} :catchall_28
6225 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6228 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6230 new-instance v3, Landroid/content/Intent;
6232 - const-string v4, "android.intent.action.SIG_STR"
6233 + const-string v4, "android.intent.action.SERVICE_STATE"
6235 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6237 - const/high16 v4, 0x2000
6239 - invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6241 new-instance v0, Landroid/os/Bundle;
6243 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6245 - invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6246 + invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6248 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6250 @@ -478,20 +479,20 @@
6258 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6270 -.method private checkListenerPermission(I)V
6271 +.method protected checkListenerPermission(I)V
6279 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6280 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6283 iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6284 @@ -602,111 +603,6 @@
6288 -.method private handleRemoveListLocked()V
6291 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6293 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6297 - if-lez v2, :cond_23
6299 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6301 - invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6303 - move-result-object v1
6306 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6310 - if-eqz v2, :cond_1e
6312 - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6314 - move-result-object v0
6316 - check-cast v0, Landroid/os/IBinder;
6318 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6323 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6325 - invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6331 -.method private remove(Landroid/os/IBinder;)V
6334 - iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6339 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6341 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6348 - if-ge v0, v1, :cond_22
6350 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6352 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6354 - move-result-object v2
6356 - check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6358 - iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6360 - if-ne v2, p1, :cond_1f
6362 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6364 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6372 - add-int/lit8 v0, v0, 0x1
6386 - .catchall {:try_start_3 .. :try_end_26} :catchall_24
6393 .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6396 @@ -1204,12 +1100,55 @@
6400 +.method protected handleRemoveListLocked()V
6403 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6405 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6409 + if-lez v2, :cond_23
6411 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6413 + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6415 + move-result-object v1
6418 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6422 + if-eqz v2, :cond_1e
6424 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6426 + move-result-object v0
6428 + check-cast v0, Landroid/os/IBinder;
6430 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6435 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6437 + invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6443 .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6446 - if-eqz p3, :cond_133
6447 + if-eqz p3, :cond_131
6449 - invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6450 + invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6452 iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6454 @@ -1226,7 +1165,7 @@
6456 invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6458 - .catchall {:try_start_9 .. :try_end_12} :catchall_db
6459 + .catchall {:try_start_9 .. :try_end_12} :catchall_da
6463 @@ -1246,7 +1185,7 @@
6465 check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6467 - .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6468 + .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6471 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6472 @@ -1262,7 +1201,7 @@
6474 iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6476 - .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6477 + .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6481 @@ -1281,8 +1220,8 @@
6483 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6485 - .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6486 - .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6487 + .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6488 + .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6492 @@ -1308,8 +1247,8 @@
6494 invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6496 - .catchall {:try_start_40 .. :try_end_50} :catchall_db
6497 - .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6498 + .catchall {:try_start_40 .. :try_end_50} :catchall_da
6499 + .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6503 @@ -1324,8 +1263,8 @@
6505 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6507 - .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6508 - .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6509 + .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6510 + .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6514 @@ -1340,8 +1279,8 @@
6516 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6518 - .catchall {:try_start_5f .. :try_end_66} :catchall_db
6519 - .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6520 + .catchall {:try_start_5f .. :try_end_66} :catchall_da
6521 + .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6525 @@ -1360,8 +1299,8 @@
6527 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6529 - .catchall {:try_start_6a .. :try_end_76} :catchall_db
6530 - .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6531 + .catchall {:try_start_6a .. :try_end_76} :catchall_da
6532 + .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6536 @@ -1378,8 +1317,8 @@
6538 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6540 - .catchall {:try_start_7a .. :try_end_83} :catchall_db
6541 - .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6542 + .catchall {:try_start_7a .. :try_end_83} :catchall_da
6543 + .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6547 @@ -1396,8 +1335,8 @@
6549 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6551 - .catchall {:try_start_87 .. :try_end_90} :catchall_db
6552 - .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6553 + .catchall {:try_start_87 .. :try_end_90} :catchall_da
6554 + .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6558 @@ -1412,8 +1351,8 @@
6560 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6562 - .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6563 - .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6564 + .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6565 + .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6569 @@ -1428,8 +1367,8 @@
6571 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6573 - .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6574 - .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6575 + .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6576 + .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6580 @@ -1444,8 +1383,8 @@
6582 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6584 - .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6585 - .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6586 + .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6587 + .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6591 @@ -1464,15 +1403,15 @@
6593 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6595 - .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6596 - .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6597 + .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6598 + .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6605 - .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6606 + .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6610 @@ -1488,13 +1427,11 @@
6612 new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6616 - invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6618 - .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6619 + invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6621 + .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6625 iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6627 iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6628 @@ -1507,133 +1444,133 @@
6640 - .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6642 + .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6652 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6654 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6655 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6663 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6665 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6666 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6674 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6676 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6677 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6685 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6687 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6688 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6696 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6698 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6699 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6707 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6709 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6710 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6718 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6720 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6721 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6729 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6731 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6732 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6741 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6743 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6744 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6752 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6754 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6755 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6763 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6765 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6767 - .catchall {:try_start_df .. :try_end_132} :catchall_db
6768 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6770 + .catchall {:try_start_de .. :try_end_130} :catchall_da
6776 invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6778 move-result-object v8
6780 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6781 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6795 .method public notifyCallForwardingChanged(Z)V
6796 @@ -1641,7 +1578,7 @@
6798 const-string v3, "notifyCallForwardingChanged()"
6800 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6801 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6805 @@ -1719,7 +1656,7 @@
6809 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6810 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6814 @@ -1733,7 +1670,7 @@
6816 const-string v3, "notifyCallState()"
6818 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6819 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6823 @@ -1813,7 +1750,7 @@
6827 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6828 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6832 @@ -1829,7 +1766,7 @@
6834 const-string v3, "notifyCellInfo()"
6836 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6837 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6841 @@ -1911,7 +1848,7 @@
6845 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6846 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6850 @@ -1925,7 +1862,7 @@
6852 const-string v3, "notifyCellLocation()"
6854 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6855 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6859 @@ -2007,7 +1944,7 @@
6863 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6864 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6868 @@ -2021,7 +1958,7 @@
6870 const-string v3, "notifyDataActivity()"
6872 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6873 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6877 @@ -2099,7 +2036,7 @@
6881 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6882 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6886 @@ -2113,7 +2050,7 @@
6888 const-string v1, "notifyDataConnection()"
6890 - invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6891 + invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6895 @@ -2281,7 +2218,7 @@
6899 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6900 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6904 @@ -2316,7 +2253,7 @@
6906 const-string v0, "notifyDataConnectionFailed()"
6908 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6909 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6913 @@ -2336,7 +2273,7 @@
6915 const-string v3, "notifyMessageWaitingChanged()"
6917 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6918 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6922 @@ -2414,7 +2351,7 @@
6926 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6927 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6931 @@ -2428,7 +2365,7 @@
6933 const-string v3, "notifyOtaspChanged()"
6935 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6936 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6940 @@ -2506,7 +2443,7 @@
6944 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6945 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6949 @@ -2516,11 +2453,11 @@
6952 .method public notifyServiceState(Landroid/telephony/ServiceState;)V
6956 const-string v3, "notifyServiceState()"
6958 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6959 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6963 @@ -2537,19 +2474,29 @@
6965 iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6967 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6969 + const-string v5, ""
6971 + const-string v6, ""
6973 + const-string v7, ""
6975 + invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6977 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6979 invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6981 move-result-object v1
6987 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6991 - if-eqz v3, :cond_3d
6992 + if-eqz v3, :cond_51
6994 invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6996 @@ -2558,14 +2505,22 @@
6997 check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6999 iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
7001 - .catchall {:try_start_c .. :try_end_22} :catchall_3a
7003 + .catchall {:try_start_c .. :try_end_2d} :catchall_4e
7005 and-int/lit8 v3, v3, 0x1
7007 - if-eqz v3, :cond_14
7008 + if-eqz v3, :cond_1f
7011 + const-string v3, ""
7013 + const-string v5, ""
7015 + const-string v6, ""
7017 + invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7020 iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
7022 new-instance v5, Landroid/telephony/ServiceState;
7023 @@ -2573,42 +2528,42 @@
7024 invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
7026 invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
7028 - .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7029 - .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7031 + .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7032 + .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7043 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7045 iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7047 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7058 - .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7060 + .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7066 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7069 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7073 - .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7075 + .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7077 - invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7078 + invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7082 @@ -2618,7 +2573,7 @@
7084 const-string v4, "notifySignalStrength()"
7086 - invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7087 + invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7091 @@ -2741,7 +2696,7 @@
7095 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7096 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7100 @@ -2751,3 +2706,63 @@
7105 +.method protected remove(Landroid/os/IBinder;)V
7108 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7113 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7115 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7122 + if-ge v0, v1, :cond_22
7124 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7126 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7128 + move-result-object v2
7130 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7132 + iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7134 + if-ne v2, p1, :cond_1f
7136 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7138 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7146 + add-int/lit8 v0, v0, 0x1
7160 + .catchall {:try_start_3 .. :try_end_26} :catchall_24