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-02 22:29:33.119501332 -0500
3 +++ ext-services/smali/com/android/server/am/BroadcastQueue.smali 2012-11-02 22:29:47.631573292 -0500
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, "empty"
697 + invoke-virtual {v3, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
701 + if-eqz v3, :cond_2b0
705 - 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_315
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 - move-object/from16 v0, v27
723 + if-nez v15, :cond_30f
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 + move-object/from16 v2, v16
736 - invoke-direct {v0, v1, v15, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
737 + invoke-direct {v0, v1, v2, v3}, Lcom/android/server/am/BroadcastQueue;->deliverToRegisteredReceiverLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/BroadcastFilter;Z)V
739 - move-object/from16 v0, v27
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,43 @@
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;
804 + move-object/from16 v0, v23
806 check-cast v0, Landroid/content/pm/ResolveInfo;
808 - move-object/from16 v18, v0
809 + move-object/from16 v19, v0
814 move-object/from16 v0, p0
816 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
818 - move-object/from16 v0, v18
819 + move-object/from16 v0, v19
821 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
823 iget-object v4, v5, Landroid/content/pm/ActivityInfo;->permission:Ljava/lang/String;
825 - move-object/from16 v0, v27
826 + move-object/from16 v0, v28
828 iget v5, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
830 - move-object/from16 v0, v27
831 + move-object/from16 v0, v28
833 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
835 - move-object/from16 v0, v18
836 + move-object/from16 v0, v19
838 iget-object v7, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
840 @@ -2769,7 +2942,7 @@
842 iget v7, v7, Landroid/content/pm/ApplicationInfo;->uid:I
844 - move-object/from16 v0, v18
845 + move-object/from16 v0, v19
847 iget-object v8, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
849 @@ -2777,17 +2950,17 @@
851 invoke-virtual/range {v3 .. v8}, Lcom/android/server/am/ActivityManagerService;->checkComponentPermission(Ljava/lang/String;IIIZ)I
856 - if-eqz v26, :cond_397
857 + if-eqz v27, :cond_3cf
859 - move-object/from16 v0, v18
860 + move-object/from16 v0, v19
862 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
864 iget-boolean v3, v3, Landroid/content/pm/ActivityInfo;->exported:Z
866 - if-nez v3, :cond_446
867 + if-nez v3, :cond_482
869 const-string v3, "BroadcastQueue"
871 @@ -2801,7 +2974,7 @@
873 move-result-object v5
875 - move-object/from16 v0, v27
876 + move-object/from16 v0, v28
878 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
880 @@ -2819,7 +2992,7 @@
882 move-result-object v5
884 - move-object/from16 v0, v27
885 + move-object/from16 v0, v28
887 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
889 @@ -2833,7 +3006,7 @@
891 move-result-object v5
893 - move-object/from16 v0, v27
894 + move-object/from16 v0, v28
896 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
898 @@ -2847,7 +3020,7 @@
900 move-result-object v5
902 - move-object/from16 v0, v27
903 + move-object/from16 v0, v28
905 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
907 @@ -2867,7 +3040,7 @@
909 move-result-object v5
911 - move-object/from16 v0, v18
912 + move-object/from16 v0, v19
914 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
916 @@ -2885,7 +3058,7 @@
918 move-result-object v5
920 - move-object/from16 v0, v18
921 + move-object/from16 v0, v19
923 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
925 @@ -2901,7 +3074,7 @@
927 move-result-object v5
929 - move-object/from16 v0, v18
930 + move-object/from16 v0, v19
932 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
934 @@ -2917,11 +3090,11 @@
936 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
944 - move-object/from16 v0, v18
946 + move-object/from16 v0, v19
948 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
950 @@ -2931,26 +3104,26 @@
954 - if-eq v3, v5, :cond_41f
955 + if-eq v3, v5, :cond_457
957 - move-object/from16 v0, v27
958 + move-object/from16 v0, v28
960 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
962 - .catchall {:try_start_224 .. :try_end_3a7} :catchall_69
964 + .catchall {:try_start_224 .. :try_end_3df} :catchall_69
966 - if-eqz v3, :cond_41f
967 + if-eqz v3, :cond_457
971 invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
973 move-result-object v3
975 - move-object/from16 v0, v27
976 + move-object/from16 v0, v28
978 iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
980 - move-object/from16 v0, v18
981 + move-object/from16 v0, v19
983 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
985 @@ -2959,16 +3132,16 @@
986 iget-object v6, v6, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
988 invoke-interface {v3, v5, v6}, Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;)I
990 - .catchall {:try_start_3a9 .. :try_end_3bc} :catchall_69
991 - .catch Landroid/os/RemoteException; {:try_start_3a9 .. :try_end_3bc} :catch_4c8
993 + .catchall {:try_start_3e1 .. :try_end_3f4} :catchall_69
994 + .catch Landroid/os/RemoteException; {:try_start_3e1 .. :try_end_3f4} :catch_504
1000 - if-eqz v26, :cond_41f
1002 + if-eqz v27, :cond_457
1006 const-string v3, "BroadcastQueue"
1008 new-instance v5, Ljava/lang/StringBuilder;
1009 @@ -2981,7 +3154,7 @@
1011 move-result-object v5
1013 - move-object/from16 v0, v27
1014 + move-object/from16 v0, v28
1016 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1018 @@ -2995,7 +3168,7 @@
1020 move-result-object v5
1022 - move-object/from16 v0, v18
1023 + move-object/from16 v0, v19
1025 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1027 @@ -3013,7 +3186,7 @@
1029 move-result-object v5
1031 - move-object/from16 v0, v27
1032 + move-object/from16 v0, v28
1034 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->requiredPermission:Ljava/lang/String;
1036 @@ -3027,7 +3200,7 @@
1038 move-result-object v5
1040 - move-object/from16 v0, v27
1041 + move-object/from16 v0, v28
1043 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1045 @@ -3041,7 +3214,7 @@
1047 move-result-object v5
1049 - move-object/from16 v0, v27
1050 + move-object/from16 v0, v28
1052 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1054 @@ -3061,53 +3234,58 @@
1056 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1062 - move-object/from16 v0, v27
1064 + move-object/from16 v0, v28
1066 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1068 - if-eqz v3, :cond_42f
1069 + if-eqz v3, :cond_467
1071 - move-object/from16 v0, v27
1072 + move-object/from16 v0, v28
1074 iget-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1076 iget-boolean v3, v3, Lcom/android/server/am/ProcessRecord;->crashing:Z
1078 - if-eqz v3, :cond_42f
1079 + if-eqz v3, :cond_467
1084 + if-eqz v15, :cond_46b
1090 - if-eqz v29, :cond_4cd
1092 + if-eqz v30, :cond_509
1096 - move-object/from16 v0, v27
1097 + move-object/from16 v0, v28
1099 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->receiver:Landroid/os/IBinder;
1103 - move-object/from16 v0, v27
1104 + move-object/from16 v0, v28
1106 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curFilter:Lcom/android/server/am/BroadcastFilter;
1110 - move-object/from16 v0, v27
1111 + move-object/from16 v0, v28
1113 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1115 invoke-virtual/range {p0 .. p0}, Lcom/android/server/am/BroadcastQueue;->scheduleBroadcastsLocked()V
1124 const-string v3, "BroadcastQueue"
1126 new-instance v5, Ljava/lang/StringBuilder;
1127 @@ -3120,7 +3298,7 @@
1129 move-result-object v5
1131 - move-object/from16 v0, v27
1132 + move-object/from16 v0, v28
1134 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1136 @@ -3138,7 +3316,7 @@
1138 move-result-object v5
1140 - move-object/from16 v0, v27
1141 + move-object/from16 v0, v28
1143 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1145 @@ -3152,7 +3330,7 @@
1147 move-result-object v5
1149 - move-object/from16 v0, v27
1150 + move-object/from16 v0, v28
1152 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingPid:I
1154 @@ -3166,7 +3344,7 @@
1156 move-result-object v5
1158 - move-object/from16 v0, v27
1159 + move-object/from16 v0, v28
1161 iget v6, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1163 @@ -3186,7 +3364,7 @@
1165 move-result-object v5
1167 - move-object/from16 v0, v18
1168 + move-object/from16 v0, v19
1170 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1172 @@ -3202,7 +3380,7 @@
1174 move-result-object v5
1176 - move-object/from16 v0, v18
1177 + move-object/from16 v0, v19
1179 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1181 @@ -3218,7 +3396,7 @@
1183 move-result-object v5
1185 - move-object/from16 v0, v18
1186 + move-object/from16 v0, v19
1188 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1190 @@ -3234,23 +3412,23 @@
1192 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1201 - const/16 v26, -0x1
1202 + const/16 v27, -0x1
1211 - move-object/from16 v0, v27
1212 + move-object/from16 v0, v28
1214 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1216 - move-object/from16 v0, v18
1217 + move-object/from16 v0, v19
1219 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1221 @@ -3258,7 +3436,7 @@
1223 new-instance v3, Landroid/content/ComponentName;
1225 - move-object/from16 v0, v18
1226 + move-object/from16 v0, v19
1228 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1230 @@ -3266,7 +3444,7 @@
1232 iget-object v5, v5, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
1234 - move-object/from16 v0, v18
1235 + move-object/from16 v0, v19
1237 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1239 @@ -3274,29 +3452,29 @@
1241 invoke-direct {v3, v5, v6}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
1243 - move-object/from16 v0, v27
1244 + move-object/from16 v0, v28
1246 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1248 - move-object/from16 v0, v27
1249 + move-object/from16 v0, v28
1251 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1255 - if-eq v3, v5, :cond_521
1256 + if-eq v3, v5, :cond_55d
1258 move-object/from16 v0, p0
1260 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1262 - move-object/from16 v0, v18
1263 + move-object/from16 v0, v19
1265 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1267 iget-object v5, v5, Landroid/content/pm/ActivityInfo;->processName:Ljava/lang/String;
1269 - move-object/from16 v0, v18
1270 + move-object/from16 v0, v19
1272 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1274 @@ -3304,48 +3482,48 @@
1276 invoke-virtual {v3, v5, v6}, Lcom/android/server/am/ActivityManagerService;->isSingleton(Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Z
1281 - if-eqz v20, :cond_56a
1282 + if-eqz v21, :cond_5a6
1289 move-object/from16 v0, p0
1291 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1293 - move-object/from16 v0, v18
1294 + move-object/from16 v0, v19
1296 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1298 - move/from16 v0, v31
1299 + move/from16 v0, v32
1301 invoke-virtual {v3, v5, v0}, Lcom/android/server/am/ActivityManagerService;->getActivityInfoForUser(Landroid/content/pm/ActivityInfo;I)Landroid/content/pm/ActivityInfo;
1303 move-result-object v3
1305 - move-object/from16 v0, v18
1306 + move-object/from16 v0, v19
1308 iput-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1311 - move-object/from16 v0, v18
1313 + move-object/from16 v0, v19
1315 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1317 - move-object/from16 v0, v27
1318 + move-object/from16 v0, v28
1320 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curReceiver:Landroid/content/pm/ActivityInfo;
1322 - .catchall {:try_start_3bf .. :try_end_529} :catchall_69
1324 + .catchall {:try_start_3f7 .. :try_end_565} :catchall_69
1328 invoke-static {}, Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager;
1330 move-result-object v3
1332 - move-object/from16 v0, v27
1333 + move-object/from16 v0, v28
1335 iget-object v5, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1337 @@ -3355,7 +3533,7 @@
1341 - move-object/from16 v0, v27
1342 + move-object/from16 v0, v28
1344 iget v7, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1346 @@ -3364,18 +3542,18 @@
1349 invoke-interface {v3, v5, v6, v7}, Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
1351 - .catchall {:try_start_529 .. :try_end_541} :catchall_69
1352 - .catch Landroid/os/RemoteException; {:try_start_529 .. :try_end_541} :catch_671
1353 - .catch Ljava/lang/IllegalArgumentException; {:try_start_529 .. :try_end_541} :catch_573
1355 + .catchall {:try_start_565 .. :try_end_57d} :catchall_69
1356 + .catch Landroid/os/RemoteException; {:try_start_565 .. :try_end_57d} :catch_6ad
1357 + .catch Ljava/lang/IllegalArgumentException; {:try_start_565 .. :try_end_57d} :catch_5af
1363 move-object/from16 v0, p0
1365 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1367 - move-object/from16 v0, v18
1368 + move-object/from16 v0, v19
1370 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1372 @@ -3387,16 +3565,16 @@
1374 move-result-object v13
1376 - if-eqz v13, :cond_5bc
1377 + if-eqz v13, :cond_5f8
1379 iget-object v3, v13, Lcom/android/server/am/ProcessRecord;->thread:Landroid/app/IApplicationThread;
1381 - .catchall {:try_start_541 .. :try_end_555} :catchall_69
1383 + .catchall {:try_start_57d .. :try_end_591} :catchall_69
1385 - if-eqz v3, :cond_5bc
1386 + if-eqz v3, :cond_5f8
1389 - move-object/from16 v0, v18
1391 + move-object/from16 v0, v19
1393 iget-object v3, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1395 @@ -3406,30 +3584,30 @@
1397 move-object/from16 v0, p0
1399 - move-object/from16 v1, v27
1400 + move-object/from16 v1, v28
1402 invoke-direct {v0, v1, v13}, Lcom/android/server/am/BroadcastQueue;->processCurBroadcastLocked(Lcom/android/server/am/BroadcastRecord;Lcom/android/server/am/ProcessRecord;)V
1404 - .catchall {:try_start_557 .. :try_end_567} :catchall_69
1405 - .catch Landroid/os/RemoteException; {:try_start_557 .. :try_end_567} :catch_59f
1407 + .catchall {:try_start_593 .. :try_end_5a3} :catchall_69
1408 + .catch Landroid/os/RemoteException; {:try_start_593 .. :try_end_5a3} :catch_5db
1418 - move-object/from16 v0, v27
1420 + move-object/from16 v0, v28
1422 iget v3, v0, Lcom/android/server/am/BroadcastRecord;->callingUid:I
1424 invoke-static {v3}, Landroid/os/UserId;->getUserId(I)I
1436 const-string v3, "BroadcastQueue"
1437 @@ -3444,7 +3622,7 @@
1439 move-result-object v5
1441 - move-object/from16 v0, v27
1442 + move-object/from16 v0, v28
1444 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1446 @@ -3472,9 +3650,9 @@
1448 invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1457 const-string v3, "BroadcastQueue"
1458 @@ -3489,7 +3667,7 @@
1460 move-result-object v5
1462 - move-object/from16 v0, v27
1463 + move-object/from16 v0, v28
1465 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1467 @@ -3503,12 +3681,12 @@
1469 invoke-static {v3, v5, v14}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
1473 move-object/from16 v0, p0
1475 iget-object v3, v0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1477 - move-object/from16 v0, v18
1478 + move-object/from16 v0, v19
1480 iget-object v5, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1482 @@ -3516,7 +3694,7 @@
1486 - move-object/from16 v0, v27
1487 + move-object/from16 v0, v28
1489 iget-object v7, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1491 @@ -3528,11 +3706,11 @@
1493 const-string v8, "broadcast"
1495 - move-object/from16 v0, v27
1496 + move-object/from16 v0, v28
1498 iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->curComponent:Landroid/content/ComponentName;
1500 - move-object/from16 v0, v27
1501 + move-object/from16 v0, v28
1503 iget-object v10, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1505 @@ -3544,22 +3722,22 @@
1507 and-int/2addr v10, v11
1509 - if-eqz v10, :cond_660
1510 + if-eqz v10, :cond_69c
1518 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;
1520 move-result-object v3
1522 - move-object/from16 v0, v27
1523 + move-object/from16 v0, v28
1525 iput-object v3, v0, Lcom/android/server/am/BroadcastRecord;->curApp:Lcom/android/server/am/ProcessRecord;
1527 - if-nez v3, :cond_662
1528 + if-nez v3, :cond_69e
1530 const-string v3, "BroadcastQueue"
1532 @@ -3573,7 +3751,7 @@
1534 move-result-object v5
1536 - move-object/from16 v0, v18
1537 + move-object/from16 v0, v19
1539 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1541 @@ -3591,7 +3769,7 @@
1543 move-result-object v5
1545 - move-object/from16 v0, v18
1546 + move-object/from16 v0, v19
1548 iget-object v6, v0, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1550 @@ -3609,7 +3787,7 @@
1552 move-result-object v5
1554 - move-object/from16 v0, v27
1555 + move-object/from16 v0, v28
1557 iget-object v6, v0, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1559 @@ -3631,23 +3809,23 @@
1561 move-object/from16 v0, p0
1563 - move-object/from16 v1, v27
1564 + move-object/from16 v1, v28
1566 invoke-virtual {v0, v1}, Lcom/android/server/am/BroadcastQueue;->logBroadcastReceiverDiscardLocked(Lcom/android/server/am/BroadcastRecord;)V
1568 - move-object/from16 v0, v27
1569 + move-object/from16 v0, v28
1571 iget v7, v0, Lcom/android/server/am/BroadcastRecord;->resultCode:I
1573 - move-object/from16 v0, v27
1574 + move-object/from16 v0, v28
1576 iget-object v8, v0, Lcom/android/server/am/BroadcastRecord;->resultData:Ljava/lang/String;
1578 - move-object/from16 v0, v27
1579 + move-object/from16 v0, v28
1581 iget-object v9, v0, Lcom/android/server/am/BroadcastRecord;->resultExtras:Landroid/os/Bundle;
1583 - move-object/from16 v0, v27
1584 + move-object/from16 v0, v28
1586 iget-boolean v10, v0, Lcom/android/server/am/BroadcastRecord;->resultAbort:Z
1588 @@ -3655,7 +3833,7 @@
1590 move-object/from16 v5, p0
1592 - move-object/from16 v6, v27
1593 + move-object/from16 v6, v28
1595 invoke-virtual/range {v5 .. v11}, Lcom/android/server/am/BroadcastQueue;->finishReceiverLocked(Lcom/android/server/am/BroadcastRecord;ILjava/lang/String;Landroid/os/Bundle;ZZ)Z
1597 @@ -3663,42 +3841,42 @@
1601 - move-object/from16 v0, v27
1602 + move-object/from16 v0, v28
1604 iput v3, v0, Lcom/android/server/am/BroadcastRecord;->state:I
1619 - move-object/from16 v0, v27
1621 + move-object/from16 v0, v28
1623 move-object/from16 v1, p0
1625 iput-object v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcast:Lcom/android/server/am/BroadcastRecord;
1627 - move/from16 v0, v28
1628 + move/from16 v0, v29
1630 move-object/from16 v1, p0
1632 iput v0, v1, Lcom/android/server/am/BroadcastQueue;->mPendingBroadcastRecvIndex:I
1636 - .catchall {:try_start_567 .. :try_end_66f} :catchall_69
1639 + .catchall {:try_start_5a3 .. :try_end_6ab} :catchall_69
1651 .method public final replaceOrderedBroadcastLocked(Lcom/android/server/am/BroadcastRecord;)Z
1652 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali
1653 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali 1969-12-31 18:00:00.000000000 -0600
1654 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry$1.smali 2012-11-02 22:29:46.679568579 -0500
1656 +.class Lcom/android/server/PrivacyTelephonyRegistry$1;
1657 +.super Landroid/content/BroadcastReceiver;
1658 +.source "PrivacyTelephonyRegistry.java"
1662 +.annotation system Ldalvik/annotation/EnclosingClass;
1663 + value = Lcom/android/server/PrivacyTelephonyRegistry;
1666 +.annotation system Ldalvik/annotation/InnerClass;
1673 +.field final synthetic this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1677 +.method constructor <init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1680 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1682 + invoke-direct {p0}, Landroid/content/BroadcastReceiver;-><init>()V
1689 +.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
1694 + invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
1696 + move-result-object v3
1698 + const-string v4, "android.privacy.BLOCKED_PHONE_CALL"
1700 + invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
1704 + if-eqz v3, :cond_44
1706 + new-instance v0, Landroid/os/Bundle;
1708 + invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
1710 + invoke-virtual {p2}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
1712 + move-result-object v0
1714 + const-string v3, "packageName"
1716 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1718 + move-result-object v1
1720 + const-string v3, "packageName"
1722 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1726 + if-eqz v3, :cond_45
1728 + const-string v3, "PrivacyTelephonyRegistry"
1730 + new-instance v4, Ljava/lang/StringBuilder;
1732 + invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
1734 + const-string v5, "got blocked phone call INTENT from package: "
1736 + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1738 + move-result-object v4
1740 + const-string v5, "packageName"
1742 + invoke-virtual {v0, v5}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
1744 + move-result-object v5
1746 + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
1748 + move-result-object v4
1750 + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
1752 + move-result-object v4
1754 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1757 + if-nez v1, :cond_4d
1764 + const-string v3, "PrivacyTelephonyRegistry"
1766 + const-string v4, "got blocked phone call INTENT without package information"
1768 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1773 + const-string v3, "phoneState"
1775 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
1779 + if-eqz v3, :cond_76
1781 + const-string v3, "phoneState"
1783 + invoke-virtual {v0, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
1787 + packed-switch v2, :pswitch_data_7e
1792 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1796 + invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1801 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1805 + invoke-virtual {v3, v4, v6, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1810 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry$1;->this$0:Lcom/android/server/PrivacyTelephonyRegistry;
1814 + const-string v5, "12345"
1816 + invoke-virtual {v3, v4, v5, v1}, Lcom/android/server/PrivacyTelephonyRegistry;->notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
1821 + const-string v3, "PrivacyTelephonyRegistry"
1823 + const-string v4, "we forgot to put phoneState in Intent?"
1825 + invoke-static {v3, v4}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1830 + .packed-switch 0x0
1834 + .end packed-switch
1836 diff -Npru stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali
1837 --- stock-services/smali/com/android/server/PrivacyTelephonyRegistry.smali 1969-12-31 18:00:00.000000000 -0600
1838 +++ ext-services/smali/com/android/server/PrivacyTelephonyRegistry.smali 2012-11-02 22:29:46.703568685 -0500
1840 +.class public Lcom/android/server/PrivacyTelephonyRegistry;
1841 +.super Lcom/android/server/TelephonyRegistry;
1842 +.source "PrivacyTelephonyRegistry.java"
1846 +.field private static final PERMISSION_CALL_STATE:I = 0x3
1848 +.field private static final PERMISSION_CELL_INFO:I = 0x1
1850 +.field private static final PERMISSION_CELL_LOCATION:I = 0x0
1852 +.field private static final PERMISSION_SERVICE_STATE:I = 0x4
1854 +.field private static final PERMISSION_SIGNAL_STRENGTH:I = 0x2
1856 +.field private static final P_TAG:Ljava/lang/String; = "PrivacyTelephonyRegistry"
1860 +.field private pSetMan:Landroid/privacy/PrivacySettingsManager;
1862 +.field private final privacyReceiver:Landroid/content/BroadcastReceiver;
1866 +.method public constructor <init>(Landroid/content/Context;)V
1869 + invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
1871 + new-instance v1, Lcom/android/server/PrivacyTelephonyRegistry$1;
1873 + invoke-direct {v1, p0}, Lcom/android/server/PrivacyTelephonyRegistry$1;-><init>(Lcom/android/server/PrivacyTelephonyRegistry;)V
1875 + iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
1877 + new-instance v1, Landroid/privacy/PrivacySettingsManager;
1879 + const-string v2, "privacy"
1881 + invoke-static {v2}, Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder;
1883 + move-result-object v2
1885 + invoke-static {v2}, Landroid/privacy/IPrivacySettingsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/privacy/IPrivacySettingsManager;
1887 + move-result-object v2
1889 + invoke-direct {v1, p1, v2}, Landroid/privacy/PrivacySettingsManager;-><init>(Landroid/content/Context;Landroid/privacy/IPrivacySettingsManager;)V
1891 + iput-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1894 + invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
1896 + .catch Ljava/lang/Exception; {:try_start_1b .. :try_end_1e} :catch_26
1899 + const-string v1, "PrivacyTelephonyRegistry"
1901 + const-string v2, "constructor ready"
1903 + invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
1910 + const-string v1, "PrivacyTelephonyRegistry"
1912 + const-string v2, "failed to register privacy broadcastreceiver"
1914 + invoke-static {v1, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
1919 +.method private isPackageAllowed(ILjava/lang/String;)Z
1926 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->pSetMan:Landroid/privacy/PrivacySettingsManager;
1928 + invoke-static {}, Landroid/os/Process;->myUid()I
1932 + invoke-virtual {v3, p2, v4}, Landroid/privacy/PrivacySettingsManager;->getSettings(Ljava/lang/String;I)Landroid/privacy/PrivacySettings;
1934 + move-result-object v0
1936 + if-nez v0, :cond_f
1943 + packed-switch p1, :pswitch_data_42
1948 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1952 + if-nez v3, :cond_e
1954 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationGpsSetting()B
1958 + if-nez v3, :cond_e
1965 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()B
1969 + if-nez v3, :cond_e
1976 + invoke-virtual {v0}, Landroid/privacy/PrivacySettings;->getLocationNetworkSetting()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
2011 + .packed-switch 0x0
2017 + .end packed-switch
2020 +.method private registerPrivacy()V
2023 + new-instance v0, Landroid/content/IntentFilter;
2025 + const-string v1, "android.privacy.BLOCKED_PHONE_CALL"
2027 + invoke-direct {v0, v1}, Landroid/content/IntentFilter;-><init>(Ljava/lang/String;)V
2029 + iget-object v1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mContext:Landroid/content/Context;
2031 + iget-object v2, p0, Lcom/android/server/PrivacyTelephonyRegistry;->privacyReceiver:Landroid/content/BroadcastReceiver;
2033 + invoke-virtual {v1, v2, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
2040 +.method public bridge synthetic dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2043 + invoke-super {p0, p1, p2, p3}, Lcom/android/server/TelephonyRegistry;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
2048 +.method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
2052 + invoke-direct {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->registerPrivacy()V
2054 + .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_3} :catch_af
2057 + if-eqz p3, :cond_110
2059 + move/from16 v0, p3
2061 + invoke-virtual {p0, v0}, Lcom/android/server/PrivacyTelephonyRegistry;->checkListenerPermission(I)V
2063 + iget-object v11, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2070 + invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2072 + move-result-object v2
2074 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2076 + invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
2078 + .catchall {:try_start_e .. :try_end_17} :catchall_d2
2084 + move-object v8, v7
2087 + if-ge v6, v1, :cond_be
2090 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2092 + invoke-virtual {v10, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
2094 + move-result-object v7
2096 + check-cast v7, Lcom/android/server/TelephonyRegistry$Record;
2098 + .catchall {:try_start_1c .. :try_end_24} :catchall_118
2101 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2103 + if-ne v2, v10, :cond_b9
2106 + iget v10, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2108 + xor-int v10, v10, p3
2110 + and-int v9, p3, v10
2112 + move/from16 v0, p3
2114 + iput v0, v7, Lcom/android/server/TelephonyRegistry$Record;->events:I
2116 + .catchall {:try_start_24 .. :try_end_32} :catchall_d2
2118 + if-eqz p4, :cond_ad
2120 + and-int/lit8 v10, p3, 0x1
2122 + if-eqz v10, :cond_38
2125 + and-int/lit8 v10, p3, 0x2
2127 + if-eqz v10, :cond_4c
2130 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2132 + invoke-virtual {v10}, Landroid/telephony/SignalStrength;->getGsmSignalStrength()I
2136 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2138 + const/16 v12, 0x63
2140 + if-ne v5, v12, :cond_49
2145 + invoke-interface {v10, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
2147 + .catchall {:try_start_3c .. :try_end_4c} :catchall_d2
2148 + .catch Landroid/os/RemoteException; {:try_start_3c .. :try_end_4c} :catch_d5
2152 + and-int/lit8 v10, p3, 0x4
2154 + if-eqz v10, :cond_57
2157 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2159 + iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mMessageWaiting:Z
2161 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
2163 + .catchall {:try_start_50 .. :try_end_57} :catchall_d2
2164 + .catch Landroid/os/RemoteException; {:try_start_50 .. :try_end_57} :catch_dd
2168 + and-int/lit8 v10, p3, 0x8
2170 + if-eqz v10, :cond_62
2173 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2175 + iget-boolean v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallForwarding:Z
2177 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
2179 + .catchall {:try_start_5b .. :try_end_62} :catchall_d2
2180 + .catch Landroid/os/RemoteException; {:try_start_5b .. :try_end_62} :catch_e5
2184 + and-int/lit8 v10, p3, 0x10
2186 + if-eqz v10, :cond_66
2189 + and-int/lit8 v10, p3, 0x20
2191 + if-eqz v10, :cond_73
2194 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2196 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallState:I
2198 + iget-object v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCallIncomingNumber:Ljava/lang/String;
2200 + invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
2202 + .catchall {:try_start_6a .. :try_end_73} :catchall_d2
2203 + .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_73} :catch_ed
2207 + and-int/lit8 v10, p3, 0x40
2209 + if-eqz v10, :cond_80
2212 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2214 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionState:I
2216 + iget v13, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataConnectionNetworkType:I
2218 + invoke-interface {v10, v12, v13}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
2220 + .catchall {:try_start_77 .. :try_end_80} :catchall_d2
2221 + .catch Landroid/os/RemoteException; {:try_start_77 .. :try_end_80} :catch_f4
2225 + move/from16 v0, p3
2227 + and-int/lit16 v10, v0, 0x80
2229 + if-eqz v10, :cond_8d
2232 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2234 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mDataActivity:I
2236 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
2238 + .catchall {:try_start_86 .. :try_end_8d} :catchall_d2
2239 + .catch Landroid/os/RemoteException; {:try_start_86 .. :try_end_8d} :catch_fb
2243 + move/from16 v0, p3
2245 + and-int/lit16 v10, v0, 0x100
2247 + if-eqz v10, :cond_9a
2250 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2252 + iget-object v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mSignalStrength:Landroid/telephony/SignalStrength;
2254 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
2256 + .catchall {:try_start_93 .. :try_end_9a} :catchall_d2
2257 + .catch Landroid/os/RemoteException; {:try_start_93 .. :try_end_9a} :catch_102
2261 + move/from16 v0, p3
2263 + and-int/lit16 v10, v0, 0x200
2265 + if-eqz v10, :cond_a7
2268 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2270 + iget v12, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mOtaspMode:I
2272 + invoke-interface {v10, v12}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
2274 + .catchall {:try_start_a0 .. :try_end_a7} :catchall_d2
2275 + .catch Landroid/os/RemoteException; {:try_start_a0 .. :try_end_a7} :catch_109
2279 + move/from16 v0, p3
2281 + and-int/lit16 v10, v0, 0x400
2283 + if-eqz v10, :cond_ad
2289 + .catchall {:try_start_ad .. :try_end_ae} :catchall_d2
2297 + const-string v10, "PrivacyTelephonyRegistry"
2299 + const-string v11, "failed to register privacy broadcastreceiver"
2301 + invoke-static {v10, v11}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
2306 + add-int/lit8 v6, v6, 0x1
2308 + move-object v8, v7
2314 + new-instance v7, Lcom/android/server/TelephonyRegistry$Record;
2316 + invoke-direct {v7}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
2318 + .catchall {:try_start_be .. :try_end_c3} :catchall_118
2321 + iput-object v2, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2323 + move-object/from16 v0, p2
2325 + iput-object v0, v7, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2327 + iput-object p1, v7, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2329 + iget-object v10, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2331 + invoke-virtual {v10, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2336 + move-exception v10
2341 + .catchall {:try_start_c3 .. :try_end_d4} :catchall_d2
2349 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2351 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2358 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2360 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2367 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2369 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2376 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2378 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2385 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2387 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2394 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2396 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2403 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2405 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2412 + iget-object v10, v7, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2414 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2416 + .catchall {:try_start_d6 .. :try_end_10f} :catchall_d2
2421 + invoke-interface/range {p2 .. p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
2423 + move-result-object v10
2425 + invoke-virtual {p0, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->remove(Landroid/os/IBinder;)V
2430 + move-exception v10
2432 + move-object v7, v8
2437 +.method public bridge synthetic notifyCallForwardingChanged(Z)V
2440 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyCallForwardingChanged(Z)V
2445 +.method public bridge synthetic notifyCallState(ILjava/lang/String;)V
2448 + invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyCallState(ILjava/lang/String;)V
2453 +.method public notifyCellInfo(Landroid/telephony/CellInfo;)V
2456 + const-string v2, "notifyCellInfo()"
2458 + move-object/from16 v0, p0
2460 + invoke-virtual {v0, v2}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2464 + if-nez v2, :cond_b
2470 + move-object/from16 v0, p0
2472 + iget-object v15, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2477 + move-object/from16 v0, p1
2479 + move-object/from16 v1, p0
2481 + iput-object v0, v1, Lcom/android/server/PrivacyTelephonyRegistry;->mCellInfo:Landroid/telephony/CellInfo;
2483 + move-object/from16 v0, p0
2485 + iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2487 + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2489 + move-result-object v13
2493 + invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z
2497 + if-eqz v2, :cond_cb
2499 + invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2501 + move-result-object v14
2503 + check-cast v14, Lcom/android/server/TelephonyRegistry$Record;
2505 + iget v2, v14, Lcom/android/server/TelephonyRegistry$Record;->events:I
2507 + .catchall {:try_start_10 .. :try_end_2c} :catchall_9a
2509 + and-int/lit16 v2, v2, 0x400
2511 + if-eqz v2, :cond_1e
2516 + iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2518 + move-object/from16 v0, p0
2520 + invoke-direct {v0, v2, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2524 + if-nez v2, :cond_9d
2526 + iget-object v0, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2528 + move-object/from16 v16, v0
2530 + new-instance v17, Landroid/telephony/CellInfo;
2534 + invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2536 + move-result-wide v18
2538 + invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
2540 + move-result-wide v20
2544 + new-instance v10, Landroid/telephony/SignalStrength;
2546 + invoke-direct {v10}, Landroid/telephony/SignalStrength;-><init>()V
2548 + new-instance v2, Landroid/telephony/GsmCellIdentity;
2554 + const/16 v5, 0x225
2556 + const/16 v6, 0x221
2560 + const-string v8, "unknown"
2562 + invoke-direct/range {v2 .. v8}, Landroid/telephony/GsmCellIdentity;-><init>(IIIIILjava/lang/String;)V
2564 + move-object/from16 v3, v17
2568 + move-wide/from16 v5, v18
2570 + move-wide/from16 v7, v20
2572 + move-object v11, v2
2574 + invoke-direct/range {v3 .. v11}, Landroid/telephony/CellInfo;-><init>(IJJZLandroid/telephony/SignalStrength;Landroid/telephony/CellIdentity;)V
2576 + invoke-interface/range {v16 .. v17}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2578 + const-string v2, "PrivacyTelephonyRegistry"
2580 + new-instance v3, Ljava/lang/StringBuilder;
2582 + invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2584 + const-string v4, "package: "
2586 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2588 + move-result-object v3
2590 + iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2592 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2594 + move-result-object v3
2596 + const-string v4, " blocked for Cellinfo"
2598 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2600 + move-result-object v3
2602 + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2604 + move-result-object v3
2606 + invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2608 + .catchall {:try_start_31 .. :try_end_8e} :catchall_9a
2609 + .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_8e} :catch_8f
2614 + move-exception v12
2617 + move-object/from16 v0, p0
2619 + iget-object v2, v0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2621 + iget-object v3, v14, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2623 + invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2632 + .catchall {:try_start_90 .. :try_end_9c} :catchall_9a
2638 + iget-object v2, v14, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2640 + new-instance v3, Landroid/telephony/CellInfo;
2642 + move-object/from16 v0, p1
2644 + invoke-direct {v3, v0}, Landroid/telephony/CellInfo;-><init>(Landroid/telephony/CellInfo;)V
2646 + invoke-interface {v2, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
2648 + const-string v2, "PrivacyTelephonyRegistry"
2650 + new-instance v3, Ljava/lang/StringBuilder;
2652 + invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
2654 + const-string v4, "package: "
2656 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2658 + move-result-object v3
2660 + iget-object v4, v14, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2662 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2664 + move-result-object v3
2666 + const-string v4, " allowed for Cellinfo"
2668 + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2670 + move-result-object v3
2672 + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2674 + move-result-object v3
2676 + invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2678 + .catchall {:try_start_9d .. :try_end_c9} :catchall_9a
2679 + .catch Landroid/os/RemoteException; {:try_start_9d .. :try_end_c9} :catch_8f
2685 + invoke-virtual/range {p0 .. p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2689 + .catchall {:try_start_cb .. :try_end_cf} :catchall_9a
2694 +.method public notifyCellLocation(Landroid/os/Bundle;)V
2697 + const-string v8, "notifyCellLocation()"
2699 + invoke-virtual {p0, v8}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
2703 + if-nez v8, :cond_9
2709 + iget-object v9, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2714 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mCellLocation:Landroid/os/Bundle;
2716 + .catchall {:try_start_c .. :try_end_e} :catchall_7f
2723 + const-string v8, "lac"
2725 + invoke-virtual {p1, v8}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
2727 + .catchall {:try_start_10 .. :try_end_15} :catchall_7f
2728 + .catch Ljava/lang/Exception; {:try_start_10 .. :try_end_15} :catch_84
2732 + if-eqz v8, :cond_82
2738 + iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2740 + invoke-virtual {v8}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2742 + move-result-object v3
2746 + invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
2750 + if-eqz v8, :cond_bc
2752 + invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2754 + move-result-object v6
2756 + check-cast v6, Lcom/android/server/TelephonyRegistry$Record;
2758 + iget v8, v6, Lcom/android/server/TelephonyRegistry$Record;->events:I
2760 + .catchall {:try_start_19 .. :try_end_2d} :catchall_7f
2762 + and-int/lit8 v8, v8, 0x10
2764 + if-eqz v8, :cond_1f
2769 + iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2771 + invoke-direct {p0, v8, v10}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
2775 + if-nez v8, :cond_90
2777 + if-nez v2, :cond_90
2779 + new-instance v5, Landroid/os/Bundle;
2781 + invoke-direct {v5}, Landroid/os/Bundle;-><init>()V
2783 + if-eqz v4, :cond_87
2785 + new-instance v7, Landroid/telephony/cdma/CdmaCellLocation;
2787 + invoke-direct {v7}, Landroid/telephony/cdma/CdmaCellLocation;-><init>()V
2789 + invoke-virtual {v7, v5}, Landroid/telephony/cdma/CdmaCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2792 + iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2794 + new-instance v10, Landroid/os/Bundle;
2796 + invoke-direct {v10, v5}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2798 + invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2800 + const-string v8, "PrivacyTelephonyRegistry"
2802 + new-instance v10, Ljava/lang/StringBuilder;
2804 + invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2806 + const-string v11, "package: "
2808 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2810 + move-result-object v10
2812 + iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2814 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2816 + move-result-object v10
2818 + const-string v11, " blocked for CellLocation"
2820 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2822 + move-result-object v10
2824 + invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2826 + move-result-object v10
2828 + invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2830 + .catchall {:try_start_32 .. :try_end_75} :catchall_7f
2831 + .catch Landroid/os/RemoteException; {:try_start_32 .. :try_end_75} :catch_76
2839 + iget-object v8, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
2841 + iget-object v10, v6, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
2843 + invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
2852 + .catchall {:try_start_77 .. :try_end_81} :catchall_7f
2870 + new-instance v7, Landroid/telephony/gsm/GsmCellLocation;
2872 + invoke-direct {v7}, Landroid/telephony/gsm/GsmCellLocation;-><init>()V
2874 + invoke-virtual {v7, v5}, Landroid/telephony/gsm/GsmCellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V
2879 + iget-object v8, v6, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
2881 + new-instance v10, Landroid/os/Bundle;
2883 + invoke-direct {v10, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
2885 + invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
2887 + const-string v8, "PrivacyTelephonyRegistry"
2889 + new-instance v10, Ljava/lang/StringBuilder;
2891 + invoke-direct {v10}, Ljava/lang/StringBuilder;-><init>()V
2893 + const-string v11, "package: "
2895 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2897 + move-result-object v10
2899 + iget-object v11, v6, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
2901 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2903 + move-result-object v10
2905 + const-string v11, " allowed for CellLocation"
2907 + invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
2909 + move-result-object v10
2911 + invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
2913 + move-result-object v10
2915 + invoke-static {v8, v10}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
2917 + .catchall {:try_start_87 .. :try_end_ba} :catchall_7f
2918 + .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_ba} :catch_76
2924 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
2928 + .catchall {:try_start_bc .. :try_end_c0} :catchall_7f
2933 +.method public bridge synthetic notifyDataActivity(I)V
2936 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyDataActivity(I)V
2941 +.method public bridge synthetic notifyDataConnection(IZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Landroid/net/LinkCapabilities;IZ)V
2944 + 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
2949 +.method public bridge synthetic notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2952 + invoke-super {p0, p1, p2}, Lcom/android/server/TelephonyRegistry;->notifyDataConnectionFailed(Ljava/lang/String;Ljava/lang/String;)V
2957 +.method public bridge synthetic notifyMessageWaitingChanged(Z)V
2960 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyMessageWaitingChanged(Z)V
2965 +.method public bridge synthetic notifyOtaspChanged(I)V
2968 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifyOtaspChanged(I)V
2973 +.method public notifyPrivacyCallState(ILjava/lang/String;Ljava/lang/String;)V
2976 + iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2981 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
2983 + invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
2985 + move-result-object v1
2989 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
2993 + if-eqz v3, :cond_35
2995 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
2997 + move-result-object v2
2999 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3001 + iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3003 + .catchall {:try_start_3 .. :try_end_17} :catchall_32
3005 + and-int/lit8 v3, v3, 0x20
3007 + if-eqz v3, :cond_9
3010 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3012 + invoke-virtual {v3, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
3016 + if-eqz v3, :cond_9
3018 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3020 + invoke-interface {v3, p1, p2}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
3022 + .catchall {:try_start_1b .. :try_end_28} :catchall_32
3023 + .catch Landroid/os/RemoteException; {:try_start_1b .. :try_end_28} :catch_29
3031 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3033 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3035 + invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3044 + .catchall {:try_start_2a .. :try_end_34} :catchall_32
3050 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3054 + .catchall {:try_start_35 .. :try_end_39} :catchall_32
3059 +.method public notifyServiceState(Landroid/telephony/ServiceState;)V
3062 + const-string v3, "notifyServiceState()"
3064 + invoke-virtual {p0, v3}, Lcom/android/server/PrivacyTelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
3068 + if-nez v3, :cond_9
3074 + iget-object v4, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3079 + iput-object p1, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
3081 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRecords:Ljava/util/ArrayList;
3083 + invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
3085 + move-result-object v1
3089 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
3093 + if-eqz v3, :cond_90
3095 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
3097 + move-result-object v2
3099 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
3101 + iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
3103 + .catchall {:try_start_c .. :try_end_22} :catchall_6c
3105 + and-int/lit8 v3, v3, 0x1
3107 + if-eqz v3, :cond_14
3112 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3114 + invoke-direct {p0, v3, v5}, Lcom/android/server/PrivacyTelephonyRegistry;->isPackageAllowed(ILjava/lang/String;)Z
3118 + if-nez v3, :cond_6f
3120 + const-string v3, ""
3122 + const-string v5, ""
3124 + const-string v6, ""
3126 + invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
3128 + const-string v3, "PrivacyTelephonyRegistry"
3130 + new-instance v5, Ljava/lang/StringBuilder;
3132 + invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3134 + const-string v6, "package: "
3136 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3138 + move-result-object v5
3140 + iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3142 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3144 + move-result-object v5
3146 + const-string v6, " blocked for Cellinfo"
3148 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3150 + move-result-object v5
3152 + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3154 + move-result-object v5
3156 + invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3159 + iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
3161 + new-instance v5, Landroid/telephony/ServiceState;
3163 + invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
3165 + invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
3167 + .catchall {:try_start_27 .. :try_end_62} :catchall_6c
3168 + .catch Landroid/os/RemoteException; {:try_start_27 .. :try_end_62} :catch_63
3176 + iget-object v3, p0, Lcom/android/server/PrivacyTelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
3178 + iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
3180 + invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
3189 + .catchall {:try_start_64 .. :try_end_6e} :catchall_6c
3195 + const-string v3, "PrivacyTelephonyRegistry"
3197 + new-instance v5, Ljava/lang/StringBuilder;
3199 + invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
3201 + const-string v6, "package: "
3203 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3205 + move-result-object v5
3207 + iget-object v6, v2, Lcom/android/server/TelephonyRegistry$Record;->pkgForDebug:Ljava/lang/String;
3209 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3211 + move-result-object v5
3213 + const-string v6, " allowed for Cellinfo"
3215 + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
3217 + move-result-object v5
3219 + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
3221 + move-result-object v5
3223 + invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3225 + .catchall {:try_start_6f .. :try_end_8f} :catchall_6c
3226 + .catch Landroid/os/RemoteException; {:try_start_6f .. :try_end_8f} :catch_63
3232 + invoke-virtual {p0}, Lcom/android/server/PrivacyTelephonyRegistry;->handleRemoveListLocked()V
3236 + .catchall {:try_start_90 .. :try_end_94} :catchall_6c
3238 + invoke-virtual {p0, p1}, Lcom/android/server/PrivacyTelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
3243 +.method public bridge synthetic notifySignalStrength(Landroid/telephony/SignalStrength;)V
3246 + invoke-super {p0, p1}, Lcom/android/server/TelephonyRegistry;->notifySignalStrength(Landroid/telephony/SignalStrength;)V
3250 diff -Npru stock-services/smali/com/android/server/ServerThread.smali ext-services/smali/com/android/server/ServerThread.smali
3251 --- stock-services/smali/com/android/server/ServerThread.smali 2012-11-02 22:29:32.535498447 -0500
3252 +++ ext-services/smali/com/android/server/ServerThread.smali 2012-11-02 22:29:46.767569007 -0500
3257 +.method private addPrivacyService(Landroid/content/Context;)V
3261 + const-string v1, "SystemServer"
3263 + const-string v2, "Privacy Service"
3265 + invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
3267 + const-string v1, "privacy"
3269 + new-instance v2, Landroid/privacy/PrivacySettingsManagerService;
3271 + invoke-direct {v2, p1}, Landroid/privacy/PrivacySettingsManagerService;-><init>(Landroid/content/Context;)V
3273 + invoke-static {v1, v2}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3275 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_11} :catch_12
3283 + const-string v1, "SystemServer"
3285 + const-string v2, "Failure starting Privacy Service"
3287 + invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
3292 .method static final startSystemUi(Landroid/content/Context;)V
3299 - if-ne v3, v9, :cond_6b9
3300 + if-ne v3, v9, :cond_6be
3308 - if-le v3, v9, :cond_6bd
3309 + if-le v3, v9, :cond_6c2
3317 - if-eqz v3, :cond_6c1
3318 + if-eqz v3, :cond_6c6
3324 invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3326 - .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_a3e
3327 + .catch Ljava/lang/RuntimeException; {:try_start_a3 .. :try_end_c0} :catch_a43
3330 const-string v3, "power"
3333 const-string v3, "telephony.registry"
3335 - new-instance v9, Lcom/android/server/TelephonyRegistry;
3336 + new-instance v9, Lcom/android/server/PrivacyTelephonyRegistry;
3338 - invoke-direct {v9, v4}, Lcom/android/server/TelephonyRegistry;-><init>(Landroid/content/Context;)V
3339 + invoke-direct {v9, v4}, Lcom/android/server/PrivacyTelephonyRegistry;-><init>(Landroid/content/Context;)V
3341 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3347 - if-eqz v3, :cond_6c7
3348 + if-eqz v3, :cond_6cc
3350 const-string v3, "SystemServer"
3356 - if-eqz v68, :cond_6dc
3357 + if-eqz v68, :cond_6e1
3363 invoke-static {v4, v3, v0}, Lcom/android/server/pm/PackageManagerService;->main(Landroid/content/Context;ZZ)Landroid/content/pm/IPackageManager;
3365 - .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6eb
3366 + .catch Ljava/lang/RuntimeException; {:try_start_c0 .. :try_end_11f} :catch_6f0
3368 move-result-object v91
3372 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3374 - .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_9d2
3375 - .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6eb
3376 + .catch Landroid/os/RemoteException; {:try_start_122 .. :try_end_125} :catch_9d7
3377 + .catch Ljava/lang/RuntimeException; {:try_start_122 .. :try_end_125} :catch_6f0
3383 iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3385 - .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6eb
3386 + .catch Ljava/lang/RuntimeException; {:try_start_126 .. :try_end_131} :catch_6f0
3389 const-string v3, "SystemServer"
3392 invoke-direct {v0, v4}, Landroid/accounts/AccountManagerService;-><init>(Landroid/content/Context;)V
3394 - .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_6df
3395 - .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6eb
3396 + .catch Ljava/lang/Throwable; {:try_start_131 .. :try_end_13f} :catch_6e4
3397 + .catch Ljava/lang/RuntimeException; {:try_start_131 .. :try_end_13f} :catch_6f0
3400 const-string v3, "account"
3403 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3405 - .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a7d
3406 - .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_a47
3407 + .catch Ljava/lang/Throwable; {:try_start_13f .. :try_end_146} :catch_a82
3408 + .catch Ljava/lang/RuntimeException; {:try_start_13f .. :try_end_146} :catch_a4c
3410 move-object/from16 v41, v42
3416 - if-ne v0, v3, :cond_702
3417 + if-ne v0, v3, :cond_707
3421 @@ -469,6 +504,10 @@
3423 move-result-object v57
3425 + move-object/from16 v0, p0
3427 + invoke-direct {v0, v4}, Lcom/android/server/ServerThread;->addPrivacyService(Landroid/content/Context;)V
3429 const-string v3, "SystemServer"
3431 const-string v9, "System Content Providers"
3432 @@ -488,10 +527,10 @@
3433 move-object/from16 v0, v76
3435 invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3437 - .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_171} :catch_6eb
3439 + .catch Ljava/lang/RuntimeException; {:try_start_148 .. :try_end_176} :catch_6f0
3443 const-string v3, "SystemServer"
3445 const-string v9, "Battery Service"
3446 @@ -503,10 +542,10 @@
3447 move-object/from16 v0, v76
3449 invoke-direct {v5, v4, v0}, Lcom/android/server/BatteryService;-><init>(Landroid/content/Context;Lcom/android/server/LightsService;)V
3451 - .catch Ljava/lang/RuntimeException; {:try_start_171 .. :try_end_17f} :catch_a50
3453 + .catch Ljava/lang/RuntimeException; {:try_start_176 .. :try_end_184} :catch_a55
3457 const-string v3, "battery"
3459 invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3460 @@ -522,10 +561,10 @@
3461 move-object/from16 v0, v112
3463 invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3465 - .catch Ljava/lang/RuntimeException; {:try_start_17f .. :try_end_192} :catch_a59
3467 + .catch Ljava/lang/RuntimeException; {:try_start_184 .. :try_end_197} :catch_a5e
3471 const-string v3, "vibrator"
3473 move-object/from16 v0, v112
3474 @@ -549,10 +588,10 @@
3475 new-instance v7, Lcom/android/server/AlarmManagerService;
3477 invoke-direct {v7, v4}, Lcom/android/server/AlarmManagerService;-><init>(Landroid/content/Context;)V
3479 - .catch Ljava/lang/RuntimeException; {:try_start_192 .. :try_end_1ae} :catch_a60
3481 + .catch Ljava/lang/RuntimeException; {:try_start_197 .. :try_end_1b3} :catch_a65
3485 const-string v3, "alarm"
3487 invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3488 @@ -583,18 +622,18 @@
3492 - if-eq v0, v3, :cond_705
3493 + if-eq v0, v3, :cond_70a
3500 - if-nez v71, :cond_709
3502 + if-nez v71, :cond_70e
3510 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;
3511 @@ -637,22 +676,22 @@
3515 - if-eqz v3, :cond_70c
3516 + if-eqz v3, :cond_711
3518 const-string v3, "SystemServer"
3520 const-string v9, "No Bluetooh Service (emulator)"
3522 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
3524 - .catch Ljava/lang/RuntimeException; {:try_start_1ae .. :try_end_20c} :catch_71a
3526 + .catch Ljava/lang/RuntimeException; {:try_start_1b3 .. :try_end_211} :catch_71f
3530 move-object/from16 v111, v112
3532 move-object/from16 v75, v76
3543 - if-eq v0, v3, :cond_255
3544 + if-eq v0, v3, :cond_25a
3548 const-string v3, "SystemServer"
3550 const-string v9, "Input Method Service"
3551 @@ -695,22 +734,22 @@
3552 move-object/from16 v1, v120
3554 invoke-direct {v0, v4, v1}, Lcom/android/server/InputMethodManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3556 - .catch Ljava/lang/Throwable; {:try_start_22b .. :try_end_23b} :catch_76f
3558 + .catch Ljava/lang/Throwable; {:try_start_230 .. :try_end_240} :catch_774
3562 const-string v3, "input_method"
3564 move-object/from16 v0, v73
3566 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3568 - .catch Ljava/lang/Throwable; {:try_start_23b .. :try_end_242} :catch_a39
3570 + .catch Ljava/lang/Throwable; {:try_start_240 .. :try_end_247} :catch_a3e
3572 move-object/from16 v72, v73
3578 const-string v3, "SystemServer"
3580 const-string v9, "Accessibility Manager"
3581 @@ -724,24 +763,24 @@
3582 invoke-direct {v9, v4}, Lcom/android/server/accessibility/AccessibilityManagerService;-><init>(Landroid/content/Context;)V
3584 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3586 - .catch Ljava/lang/Throwable; {:try_start_244 .. :try_end_255} :catch_77b
3588 + .catch Ljava/lang/Throwable; {:try_start_249 .. :try_end_25a} :catch_780
3596 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3598 - .catch Ljava/lang/Throwable; {:try_start_255 .. :try_end_258} :catch_787
3600 + .catch Ljava/lang/Throwable; {:try_start_25a .. :try_end_25d} :catch_78c
3606 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3608 - .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_25b} :catch_793
3610 + .catch Ljava/lang/Throwable; {:try_start_25d .. :try_end_260} :catch_798
3616 invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3618 move-result-object v3
3619 @@ -759,15 +798,15 @@
3622 invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3624 - .catch Landroid/os/RemoteException; {:try_start_25b .. :try_end_26e} :catch_a36
3626 + .catch Landroid/os/RemoteException; {:try_start_260 .. :try_end_273} :catch_a3b
3634 - if-eq v0, v3, :cond_a82
3635 + if-eq v0, v3, :cond_a87
3643 - if-nez v3, :cond_29a
3644 + if-nez v3, :cond_29f
3648 const-string v3, "SystemServer"
3650 const-string v9, "Mount Service"
3651 @@ -797,23 +836,23 @@
3652 move-object/from16 v0, v83
3654 invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3656 - .catch Ljava/lang/Throwable; {:try_start_283 .. :try_end_291} :catch_79f
3658 + .catch Ljava/lang/Throwable; {:try_start_288 .. :try_end_296} :catch_7a4
3662 const-string v3, "mount"
3664 move-object/from16 v0, v83
3666 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3668 - .catch Ljava/lang/Throwable; {:try_start_291 .. :try_end_298} :catch_a31
3670 + .catch Ljava/lang/Throwable; {:try_start_296 .. :try_end_29d} :catch_a36
3672 move-object/from16 v82, v83
3680 const-string v3, "SystemServer"
3682 const-string v9, "LockSettingsService"
3683 @@ -825,22 +864,22 @@
3684 move-object/from16 v0, v80
3686 invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3688 - .catch Ljava/lang/Throwable; {:try_start_29a .. :try_end_2a8} :catch_7ab
3690 + .catch Ljava/lang/Throwable; {:try_start_29f .. :try_end_2ad} :catch_7b0
3694 const-string v3, "lock_settings"
3696 move-object/from16 v0, v80
3698 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3700 - .catch Ljava/lang/Throwable; {:try_start_2a8 .. :try_end_2af} :catch_a2c
3702 + .catch Ljava/lang/Throwable; {:try_start_2ad .. :try_end_2b4} :catch_a31
3704 move-object/from16 v79, v80
3710 const-string v3, "SystemServer"
3712 const-string v9, "Device Policy"
3713 @@ -852,22 +891,22 @@
3714 move-object/from16 v0, v62
3716 invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3718 - .catch Ljava/lang/Throwable; {:try_start_2b1 .. :try_end_2bf} :catch_7b7
3720 + .catch Ljava/lang/Throwable; {:try_start_2b6 .. :try_end_2c4} :catch_7bc
3724 const-string v3, "device_policy"
3726 move-object/from16 v0, v62
3728 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3730 - .catch Ljava/lang/Throwable; {:try_start_2bf .. :try_end_2c6} :catch_a27
3732 + .catch Ljava/lang/Throwable; {:try_start_2c4 .. :try_end_2cb} :catch_a2c
3734 move-object/from16 v61, v62
3740 const-string v3, "SystemServer"
3742 const-string v9, "Status Bar"
3743 @@ -881,22 +920,22 @@
3744 move-object/from16 v1, v120
3746 invoke-direct {v0, v4, v1}, Lcom/android/server/StatusBarManagerService;-><init>(Landroid/content/Context;Lcom/android/server/wm/WindowManagerService;)V
3748 - .catch Ljava/lang/Throwable; {:try_start_2c8 .. :try_end_2d8} :catch_7c3
3750 + .catch Ljava/lang/Throwable; {:try_start_2cd .. :try_end_2dd} :catch_7c8
3754 const-string v3, "statusbar"
3756 move-object/from16 v0, v102
3758 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3760 - .catch Ljava/lang/Throwable; {:try_start_2d8 .. :try_end_2df} :catch_a22
3762 + .catch Ljava/lang/Throwable; {:try_start_2dd .. :try_end_2e4} :catch_a27
3764 move-object/from16 v101, v102
3770 const-string v3, "SystemServer"
3772 const-string v9, "Clipboard Service"
3773 @@ -910,11 +949,11 @@
3774 invoke-direct {v9, v4}, Lcom/android/server/ClipboardService;-><init>(Landroid/content/Context;)V
3776 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3778 - .catch Ljava/lang/Throwable; {:try_start_2e1 .. :try_end_2f2} :catch_7cf
3780 + .catch Ljava/lang/Throwable; {:try_start_2e6 .. :try_end_2f7} :catch_7d4
3786 const-string v3, "SystemServer"
3788 const-string v9, "NetworkManagement Service"
3789 @@ -928,11 +967,11 @@
3790 const-string v3, "network_management"
3792 invoke-static {v3, v13}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3794 - .catch Ljava/lang/Throwable; {:try_start_2f2 .. :try_end_302} :catch_7db
3796 + .catch Ljava/lang/Throwable; {:try_start_2f7 .. :try_end_307} :catch_7e0
3802 const-string v3, "SystemServer"
3804 const-string v9, "Text Service Manager Service"
3805 @@ -944,22 +983,22 @@
3806 move-object/from16 v0, v106
3808 invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3810 - .catch Ljava/lang/Throwable; {:try_start_302 .. :try_end_310} :catch_7e7
3812 + .catch Ljava/lang/Throwable; {:try_start_307 .. :try_end_315} :catch_7ec
3816 const-string v3, "textservices"
3818 move-object/from16 v0, v106
3820 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3822 - .catch Ljava/lang/Throwable; {:try_start_310 .. :try_end_317} :catch_a1d
3824 + .catch Ljava/lang/Throwable; {:try_start_315 .. :try_end_31c} :catch_a22
3826 move-object/from16 v105, v106
3832 const-string v3, "SystemServer"
3834 const-string v9, "NetworkStats Service"
3835 @@ -971,22 +1010,22 @@
3836 move-object/from16 v0, v85
3838 invoke-direct {v0, v4, v13, v7}, Lcom/android/server/net/NetworkStatsService;-><init>(Landroid/content/Context;Landroid/os/INetworkManagementService;Landroid/app/IAlarmManager;)V
3840 - .catch Ljava/lang/Throwable; {:try_start_319 .. :try_end_327} :catch_7f3
3842 + .catch Ljava/lang/Throwable; {:try_start_31e .. :try_end_32c} :catch_7f8
3846 const-string v3, "netstats"
3848 move-object/from16 v0, v85
3850 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3852 - .catch Ljava/lang/Throwable; {:try_start_327 .. :try_end_32e} :catch_a18
3854 + .catch Ljava/lang/Throwable; {:try_start_32c .. :try_end_333} :catch_a1d
3856 move-object/from16 v12, v85
3862 const-string v3, "SystemServer"
3864 const-string v9, "NetworkPolicy Service"
3865 @@ -1004,18 +1043,18 @@
3868 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
3870 - .catch Ljava/lang/Throwable; {:try_start_330 .. :try_end_342} :catch_7ff
3872 + .catch Ljava/lang/Throwable; {:try_start_335 .. :try_end_347} :catch_804
3876 const-string v3, "netpolicy"
3878 invoke-static {v3, v8}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3880 - .catch Ljava/lang/Throwable; {:try_start_342 .. :try_end_347} :catch_a15
3882 + .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_34c} :catch_a1a
3888 const-string v3, "SystemServer"
3890 const-string v9, "Wi-Fi P2pService"
3891 @@ -1027,22 +1066,22 @@
3892 move-object/from16 v0, v119
3894 invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3896 - .catch Ljava/lang/Throwable; {:try_start_347 .. :try_end_355} :catch_80d
3898 + .catch Ljava/lang/Throwable; {:try_start_34c .. :try_end_35a} :catch_812
3902 const-string v3, "wifip2p"
3904 move-object/from16 v0, v119
3906 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3908 - .catch Ljava/lang/Throwable; {:try_start_355 .. :try_end_35c} :catch_a10
3910 + .catch Ljava/lang/Throwable; {:try_start_35a .. :try_end_361} :catch_a15
3912 move-object/from16 v118, v119
3918 const-string v3, "SystemServer"
3920 const-string v9, "Wi-Fi Service"
3921 @@ -1054,22 +1093,22 @@
3922 move-object/from16 v0, v117
3924 invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3926 - .catch Ljava/lang/Throwable; {:try_start_35e .. :try_end_36c} :catch_819
3928 + .catch Ljava/lang/Throwable; {:try_start_363 .. :try_end_371} :catch_81e
3932 const-string v3, "wifi"
3934 move-object/from16 v0, v117
3936 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3938 - .catch Ljava/lang/Throwable; {:try_start_36c .. :try_end_373} :catch_a0b
3940 + .catch Ljava/lang/Throwable; {:try_start_371 .. :try_end_378} :catch_a10
3942 move-object/from16 v116, v117
3948 const-string v3, "SystemServer"
3950 const-string v9, "Connectivity Service"
3951 @@ -1081,10 +1120,10 @@
3952 move-object/from16 v0, v56
3954 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
3956 - .catch Ljava/lang/Throwable; {:try_start_375 .. :try_end_383} :catch_825
3958 + .catch Ljava/lang/Throwable; {:try_start_37a .. :try_end_388} :catch_82a
3962 const-string v3, "connectivity"
3964 move-object/from16 v0, v56
3965 @@ -1102,13 +1141,13 @@
3966 invoke-virtual/range {v116 .. v116}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3968 invoke-virtual/range {v118 .. v118}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3970 - .catch Ljava/lang/Throwable; {:try_start_383 .. :try_end_39a} :catch_a06
3972 + .catch Ljava/lang/Throwable; {:try_start_388 .. :try_end_39f} :catch_a0b
3974 move-object/from16 v55, v56
3980 const-string v3, "SystemServer"
3982 const-string v9, "Network Service Discovery Service"
3983 @@ -1124,11 +1163,11 @@
3984 move-object/from16 v0, v99
3986 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3988 - .catch Ljava/lang/Throwable; {:try_start_39c .. :try_end_3ae} :catch_831
3990 + .catch Ljava/lang/Throwable; {:try_start_3a1 .. :try_end_3b3} :catch_836
3996 const-string v3, "SystemServer"
3998 const-string v9, "Throttle Service"
3999 @@ -1140,22 +1179,22 @@
4000 move-object/from16 v0, v104
4002 invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4004 - .catch Ljava/lang/Throwable; {:try_start_3ae .. :try_end_3bc} :catch_83d
4006 + .catch Ljava/lang/Throwable; {:try_start_3b3 .. :try_end_3c1} :catch_842
4010 const-string v3, "throttle"
4012 move-object/from16 v0, v104
4014 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4016 - .catch Ljava/lang/Throwable; {:try_start_3bc .. :try_end_3c3} :catch_a01
4018 + .catch Ljava/lang/Throwable; {:try_start_3c1 .. :try_end_3c8} :catch_a06
4020 move-object/from16 v103, v104
4026 const-string v3, "SystemServer"
4028 const-string v9, "UpdateLock Service"
4029 @@ -1169,34 +1208,34 @@
4030 invoke-direct {v9, v4}, Lcom/android/server/UpdateLockService;-><init>(Landroid/content/Context;)V
4032 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4034 - .catch Ljava/lang/Throwable; {:try_start_3c5 .. :try_end_3d6} :catch_849
4036 + .catch Ljava/lang/Throwable; {:try_start_3ca .. :try_end_3db} :catch_84e
4039 - if-eqz v82, :cond_3db
4041 + if-eqz v82, :cond_3e0
4043 invoke-virtual/range {v82 .. v82}, Lcom/android/server/MountService;->waitForAsecScan()V
4046 - if-eqz v41, :cond_3e0
4049 - invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4051 - .catch Ljava/lang/Throwable; {:try_start_3dd .. :try_end_3e0} :catch_855
4055 - if-eqz v57, :cond_3e5
4056 + if-eqz v41, :cond_3e5
4059 - invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4060 + invoke-virtual/range {v41 .. v41}, Landroid/accounts/AccountManagerService;->systemReady()V
4062 - .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_861
4063 + .catch Ljava/lang/Throwable; {:try_start_3e2 .. :try_end_3e5} :catch_85a
4068 + if-eqz v57, :cond_3ea
4071 + invoke-virtual/range {v57 .. v57}, Landroid/content/ContentService;->systemReady()V
4073 + .catch Ljava/lang/Throwable; {:try_start_3e7 .. :try_end_3ea} :catch_866
4078 const-string v3, "SystemServer"
4080 const-string v9, "Notification Manager"
4081 @@ -1212,10 +1251,10 @@
4082 move-object/from16 v2, v75
4084 invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4086 - .catch Ljava/lang/Throwable; {:try_start_3e5 .. :try_end_3f7} :catch_86d
4088 + .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3fc} :catch_872
4092 const-string v3, "notification"
4094 move-object/from16 v0, v89
4095 @@ -1225,13 +1264,13 @@
4096 move-object/from16 v0, v89
4098 invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4100 - .catch Ljava/lang/Throwable; {:try_start_3f7 .. :try_end_403} :catch_9fc
4102 + .catch Ljava/lang/Throwable; {:try_start_3fc .. :try_end_408} :catch_a01
4104 move-object/from16 v88, v89
4110 const-string v3, "SystemServer"
4112 const-string v9, "Device Storage Monitor"
4113 @@ -1245,11 +1284,11 @@
4114 invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4116 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4118 - .catch Ljava/lang/Throwable; {:try_start_405 .. :try_end_416} :catch_879
4120 + .catch Ljava/lang/Throwable; {:try_start_40a .. :try_end_41b} :catch_87e
4126 const-string v3, "SystemServer"
4128 const-string v9, "Location Manager"
4129 @@ -1261,22 +1300,22 @@
4130 move-object/from16 v0, v78
4132 invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4134 - .catch Ljava/lang/Throwable; {:try_start_416 .. :try_end_424} :catch_885
4136 + .catch Ljava/lang/Throwable; {:try_start_41b .. :try_end_429} :catch_88a
4140 const-string v3, "location"
4142 move-object/from16 v0, v78
4144 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4146 - .catch Ljava/lang/Throwable; {:try_start_424 .. :try_end_42b} :catch_9f7
4148 + .catch Ljava/lang/Throwable; {:try_start_429 .. :try_end_430} :catch_9fc
4150 move-object/from16 v77, v78
4156 const-string v3, "SystemServer"
4158 const-string v9, "Country Detector"
4159 @@ -1288,22 +1327,22 @@
4160 move-object/from16 v0, v59
4162 invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4164 - .catch Ljava/lang/Throwable; {:try_start_42d .. :try_end_43b} :catch_891
4166 + .catch Ljava/lang/Throwable; {:try_start_432 .. :try_end_440} :catch_896
4170 const-string v3, "country_detector"
4172 move-object/from16 v0, v59
4174 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4176 - .catch Ljava/lang/Throwable; {:try_start_43b .. :try_end_442} :catch_9f2
4178 + .catch Ljava/lang/Throwable; {:try_start_440 .. :try_end_447} :catch_9f7
4180 move-object/from16 v58, v59
4186 const-string v3, "SystemServer"
4188 const-string v9, "Search Service"
4189 @@ -1317,11 +1356,11 @@
4190 invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4192 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4194 - .catch Ljava/lang/Throwable; {:try_start_444 .. :try_end_455} :catch_89d
4196 + .catch Ljava/lang/Throwable; {:try_start_449 .. :try_end_45a} :catch_8a2
4202 const-string v3, "SystemServer"
4204 const-string v9, "DropBox Service"
4205 @@ -1341,10 +1380,10 @@
4206 invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4208 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4210 - .catch Ljava/lang/Throwable; {:try_start_455 .. :try_end_46d} :catch_8a9
4212 + .catch Ljava/lang/Throwable; {:try_start_45a .. :try_end_472} :catch_8ae
4216 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4218 move-result-object v3
4219 @@ -1355,38 +1394,38 @@
4223 - if-eqz v3, :cond_493
4224 + if-eqz v3, :cond_498
4228 const-string v3, "SystemServer"
4230 const-string v9, "Wallpaper Service"
4232 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4234 - if-nez v16, :cond_493
4235 + if-nez v16, :cond_498
4237 new-instance v115, Lcom/android/server/WallpaperManagerService;
4239 move-object/from16 v0, v115
4241 invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4243 - .catch Ljava/lang/Throwable; {:try_start_47a .. :try_end_48a} :catch_8b5
4245 + .catch Ljava/lang/Throwable; {:try_start_47f .. :try_end_48f} :catch_8ba
4249 const-string v3, "wallpaper"
4251 move-object/from16 v0, v115
4253 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4255 - .catch Ljava/lang/Throwable; {:try_start_48a .. :try_end_491} :catch_9ed
4257 + .catch Ljava/lang/Throwable; {:try_start_48f .. :try_end_496} :catch_9f2
4259 move-object/from16 v114, v115
4265 const-string v3, "0"
4267 const-string v9, "system_init.startaudioservice"
4268 @@ -1399,9 +1438,9 @@
4272 - if-nez v3, :cond_4b2
4273 + if-nez v3, :cond_4b7
4277 const-string v3, "SystemServer"
4279 const-string v9, "Audio Service"
4280 @@ -1415,12 +1454,12 @@
4281 invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4283 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4285 - .catch Ljava/lang/Throwable; {:try_start_4a1 .. :try_end_4b2} :catch_8c1
4287 + .catch Ljava/lang/Throwable; {:try_start_4a6 .. :try_end_4b7} :catch_8c6
4295 const-string v3, "SystemServer"
4297 const-string v9, "Dock Observer"
4298 @@ -1432,13 +1471,13 @@
4299 move-object/from16 v0, v64
4301 invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4303 - .catch Ljava/lang/Throwable; {:try_start_4b2 .. :try_end_4c0} :catch_8cd
4305 + .catch Ljava/lang/Throwable; {:try_start_4b7 .. :try_end_4c5} :catch_8d2
4307 move-object/from16 v63, v64
4313 const-string v3, "SystemServer"
4315 const-string v9, "Wired Accessory Observer"
4316 @@ -1448,11 +1487,11 @@
4317 new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4319 invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4321 - .catch Ljava/lang/Throwable; {:try_start_4c2 .. :try_end_4ce} :catch_8d9
4323 + .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d3} :catch_8de
4329 const-string v3, "SystemServer"
4331 const-string v9, "USB Service"
4332 @@ -1464,22 +1503,22 @@
4333 move-object/from16 v0, v110
4335 invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4337 - .catch Ljava/lang/Throwable; {:try_start_4ce .. :try_end_4dc} :catch_8e5
4339 + .catch Ljava/lang/Throwable; {:try_start_4d3 .. :try_end_4e1} :catch_8ea
4343 const-string v3, "usb"
4345 move-object/from16 v0, v110
4347 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4349 - .catch Ljava/lang/Throwable; {:try_start_4dc .. :try_end_4e3} :catch_9e8
4351 + .catch Ljava/lang/Throwable; {:try_start_4e1 .. :try_end_4e8} :catch_9ed
4353 move-object/from16 v109, v110
4359 const-string v3, "SystemServer"
4361 const-string v9, "Serial Service"
4362 @@ -1491,22 +1530,22 @@
4363 move-object/from16 v0, v98
4365 invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4367 - .catch Ljava/lang/Throwable; {:try_start_4e5 .. :try_end_4f3} :catch_8f1
4369 + .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_8f6
4373 const-string v3, "serial"
4375 move-object/from16 v0, v98
4377 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4379 - .catch Ljava/lang/Throwable; {:try_start_4f3 .. :try_end_4fa} :catch_9e3
4381 + .catch Ljava/lang/Throwable; {:try_start_4f8 .. :try_end_4ff} :catch_9e8
4383 move-object/from16 v97, v98
4389 const-string v3, "SystemServer"
4391 const-string v9, "UI Mode Manager Service"
4392 @@ -1518,13 +1557,13 @@
4393 move-object/from16 v0, v108
4395 invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4397 - .catch Ljava/lang/Throwable; {:try_start_4fc .. :try_end_50a} :catch_8fd
4399 + .catch Ljava/lang/Throwable; {:try_start_501 .. :try_end_50f} :catch_902
4401 move-object/from16 v107, v108
4407 const-string v3, "SystemServer"
4409 const-string v9, "Backup Service"
4410 @@ -1538,11 +1577,11 @@
4411 invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4413 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4415 - .catch Ljava/lang/Throwable; {:try_start_50c .. :try_end_51d} :catch_909
4417 + .catch Ljava/lang/Throwable; {:try_start_511 .. :try_end_522} :catch_90e
4423 const-string v3, "SystemServer"
4425 const-string v9, "AppWidget Service"
4426 @@ -1554,22 +1593,22 @@
4427 move-object/from16 v0, v45
4429 invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4431 - .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_915
4433 + .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_91a
4437 const-string v3, "appwidget"
4439 move-object/from16 v0, v45
4441 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4443 - .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_9de
4445 + .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_9e3
4447 move-object/from16 v44, v45
4453 const-string v3, "SystemServer"
4455 const-string v9, "Recognition Service"
4456 @@ -1581,13 +1620,13 @@
4457 move-object/from16 v0, v96
4459 invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4461 - .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_921
4463 + .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_926
4465 move-object/from16 v95, v96
4471 const-string v3, "SystemServer"
4473 const-string v9, "DiskStats Service"
4474 @@ -1601,11 +1640,11 @@
4475 invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4477 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4479 - .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_92d
4481 + .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_932
4487 const-string v3, "SystemServer"
4489 const-string v9, "SamplingProfiler Service"
4490 @@ -1619,11 +1658,11 @@
4491 invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4493 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4495 - .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_566} :catch_939
4497 + .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_56b} :catch_93e
4503 const-string v3, "SystemServer"
4505 const-string v9, "NetworkTimeUpdateService"
4506 @@ -1635,13 +1674,13 @@
4507 move-object/from16 v0, v87
4509 invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4511 - .catch Ljava/lang/Throwable; {:try_start_566 .. :try_end_574} :catch_945
4513 + .catch Ljava/lang/Throwable; {:try_start_56b .. :try_end_579} :catch_94a
4515 move-object/from16 v86, v87
4521 const-string v3, "SystemServer"
4523 const-string v9, "CommonTimeManagementService"
4524 @@ -1653,22 +1692,22 @@
4525 move-object/from16 v0, v53
4527 invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4529 - .catch Ljava/lang/Throwable; {:try_start_576 .. :try_end_584} :catch_951
4531 + .catch Ljava/lang/Throwable; {:try_start_57b .. :try_end_589} :catch_956
4535 const-string v3, "commontime_management"
4537 move-object/from16 v0, v53
4539 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4541 - .catch Ljava/lang/Throwable; {:try_start_584 .. :try_end_58b} :catch_9d9
4543 + .catch Ljava/lang/Throwable; {:try_start_589 .. :try_end_590} :catch_9de
4545 move-object/from16 v52, v53
4551 const-string v3, "SystemServer"
4553 const-string v9, "CertBlacklister"
4554 @@ -1678,10 +1717,10 @@
4555 new-instance v3, Lcom/android/server/CertBlacklister;
4557 invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4559 - .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_599} :catch_95d
4561 + .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_59e} :catch_962
4565 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4567 move-result-object v3
4568 @@ -1692,9 +1731,9 @@
4572 - if-eqz v3, :cond_5bd
4573 + if-eqz v3, :cond_5c2
4577 const-string v3, "SystemServer"
4579 const-string v9, "Dreams Service"
4580 @@ -1706,23 +1745,23 @@
4581 move-object/from16 v0, v66
4583 invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4585 - .catch Ljava/lang/Throwable; {:try_start_5a6 .. :try_end_5b4} :catch_969
4587 + .catch Ljava/lang/Throwable; {:try_start_5ab .. :try_end_5b9} :catch_96e
4591 const-string v3, "dreams"
4593 move-object/from16 v0, v66
4595 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4597 - .catch Ljava/lang/Throwable; {:try_start_5b4 .. :try_end_5bb} :catch_9d5
4599 + .catch Ljava/lang/Throwable; {:try_start_5b9 .. :try_end_5c0} :catch_9da
4601 move-object/from16 v65, v66
4609 const-string v3, "SystemServer"
4611 const-string v9, "AssetRedirectionManager Service"
4612 @@ -1736,15 +1775,15 @@
4613 invoke-direct {v9, v4}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
4615 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4617 - .catch Ljava/lang/Throwable; {:try_start_5bd .. :try_end_5ce} :catch_975
4619 + .catch Ljava/lang/Throwable; {:try_start_5c2 .. :try_end_5d3} :catch_97a
4623 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->detectSafeMode()Z
4627 - if-eqz v28, :cond_981
4628 + if-eqz v28, :cond_986
4630 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4632 @@ -1762,38 +1801,38 @@
4634 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4638 - invoke-virtual/range {v111 .. v111}, Lcom/android/server/VibratorService;->systemReady()V
4640 - .catch Ljava/lang/Throwable; {:try_start_5e5 .. :try_end_5e8} :catch_98a
4643 - if-eqz v61, :cond_5ed
4647 - invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4648 + invoke-virtual/range {v111 .. v111}, Lcom/android/server/VibratorService;->systemReady()V
4650 - .catch Ljava/lang/Throwable; {:try_start_5ea .. :try_end_5ed} :catch_996
4651 + .catch Ljava/lang/Throwable; {:try_start_5ea .. :try_end_5ed} :catch_98f
4655 - if-eqz v88, :cond_5f2
4656 + if-eqz v61, :cond_5f2
4659 - invoke-virtual/range {v88 .. v88}, Lcom/android/server/NotificationManagerService;->systemReady()V
4660 + invoke-virtual/range {v61 .. v61}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4662 - .catch Ljava/lang/Throwable; {:try_start_5ef .. :try_end_5f2} :catch_9a2
4663 + .catch Ljava/lang/Throwable; {:try_start_5ef .. :try_end_5f2} :catch_99b
4668 + if-eqz v88, :cond_5f7
4671 + invoke-virtual/range {v88 .. v88}, Lcom/android/server/NotificationManagerService;->systemReady()V
4673 + .catch Ljava/lang/Throwable; {:try_start_5f4 .. :try_end_5f7} :catch_9a7
4678 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4680 - .catch Ljava/lang/Throwable; {:try_start_5f2 .. :try_end_5f5} :catch_9ae
4682 + .catch Ljava/lang/Throwable; {:try_start_5f7 .. :try_end_5fa} :catch_9b3
4685 - if-eqz v28, :cond_5fe
4687 + if-eqz v28, :cond_603
4689 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4691 @@ -1801,7 +1840,7 @@
4693 invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4697 invoke-virtual/range {v120 .. v120}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4699 move-result-object v54
4700 @@ -1838,18 +1877,18 @@
4702 invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4706 invoke-interface/range {v91 .. v91}, Landroid/content/pm/IPackageManager;->systemReady()V
4708 - .catch Ljava/lang/Throwable; {:try_start_626 .. :try_end_629} :catch_9ba
4710 + .catch Ljava/lang/Throwable; {:try_start_62b .. :try_end_62e} :catch_9bf
4716 invoke-virtual/range {v79 .. v79}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4718 - .catch Ljava/lang/Throwable; {:try_start_629 .. :try_end_62c} :catch_9c6
4720 + .catch Ljava/lang/Throwable; {:try_start_62e .. :try_end_631} :catch_9cb
4724 new-instance v70, Landroid/content/IntentFilter;
4726 invoke-direct/range {v70 .. v70}, Landroid/content/IntentFilter;-><init>()V
4727 @@ -1960,7 +1999,7 @@
4731 - if-eqz v3, :cond_6ae
4732 + if-eqz v3, :cond_6b3
4734 const-string v3, "SystemServer"
4736 @@ -1968,7 +2007,7 @@
4738 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4742 invoke-static {}, Landroid/os/Looper;->loop()V
4744 const-string v3, "SystemServer"
4745 @@ -1979,25 +2018,25 @@
4763 invoke-static/range {v69 .. v69}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4773 const-string v3, "1"
4775 move-object/from16 v0, v60
4776 @@ -2018,15 +2057,15 @@
4792 const-string v3, "SystemServer"
4794 const-string v9, "Failure starting Account Manager"
4795 @@ -2034,19 +2073,19 @@
4796 move-object/from16 v0, v67
4798 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4800 - .catch Ljava/lang/RuntimeException; {:try_start_6c7 .. :try_end_6e9} :catch_6eb
4802 + .catch Ljava/lang/RuntimeException; {:try_start_6cc .. :try_end_6ee} :catch_6f0
4810 move-object/from16 v7, v43
4812 move-object/from16 v5, v46
4816 const-string v3, "System"
4818 const-string v9, "******************************************"
4819 @@ -2061,51 +2100,51 @@
4821 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4854 - if-ne v0, v3, :cond_720
4855 + if-ne v0, v3, :cond_725
4859 const-string v3, "SystemServer"
4861 const-string v9, "No Bluetooth Service (factory test)"
4863 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4872 move-object/from16 v111, v112
4874 move-object/from16 v75, v76
4881 const-string v3, "SystemServer"
4883 const-string v9, "Bluetooth Service"
4884 @@ -2117,10 +2156,10 @@
4885 move-object/from16 v0, v48
4887 invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4889 - .catch Ljava/lang/RuntimeException; {:try_start_711 .. :try_end_72e} :catch_71a
4891 + .catch Ljava/lang/RuntimeException; {:try_start_716 .. :try_end_733} :catch_71f
4895 const-string v3, "bluetooth"
4897 move-object/from16 v0, v48
4898 @@ -2141,7 +2180,7 @@
4902 - if-nez v3, :cond_75b
4903 + if-nez v3, :cond_760
4905 new-instance v50, Landroid/server/BluetoothA2dpService;
4907 @@ -2150,10 +2189,10 @@
4908 move-object/from16 v1, v48
4910 invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4912 - .catch Ljava/lang/RuntimeException; {:try_start_72e .. :try_end_74f} :catch_a69
4914 + .catch Ljava/lang/RuntimeException; {:try_start_733 .. :try_end_754} :catch_a6e
4918 const-string v3, "bluetooth_a2dp"
4920 move-object/from16 v0, v50
4921 @@ -2161,13 +2200,13 @@
4922 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4924 invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
4926 - .catch Ljava/lang/RuntimeException; {:try_start_74f .. :try_end_759} :catch_a72
4928 + .catch Ljava/lang/RuntimeException; {:try_start_754 .. :try_end_75e} :catch_a77
4930 move-object/from16 v49, v50
4936 move-object/from16 v0, p0
4938 iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4939 @@ -2180,21 +2219,21 @@
4943 - if-eqz v51, :cond_76b
4944 + if-eqz v51, :cond_770
4946 invoke-virtual/range {v48 .. v48}, Landroid/server/BluetoothService;->enable()Z
4948 - .catch Ljava/lang/RuntimeException; {:try_start_75b .. :try_end_76b} :catch_a69
4950 + .catch Ljava/lang/RuntimeException; {:try_start_760 .. :try_end_770} :catch_a6e
4954 move-object/from16 v47, v48
4965 const-string v3, "starting Input Manager Service"
4967 move-object/from16 v0, p0
4968 @@ -2203,9 +2242,9 @@
4970 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4979 const-string v3, "starting Accessibility Manager"
4980 @@ -2216,9 +2255,9 @@
4982 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
4991 const-string v3, "making display ready"
4992 @@ -2229,9 +2268,9 @@
4994 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5003 const-string v3, "performing boot dexopt"
5004 @@ -2242,12 +2281,12 @@
5006 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5017 const-string v3, "starting Mount Service"
5019 move-object/from16 v0, p0
5020 @@ -2256,12 +2295,12 @@
5022 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5033 const-string v3, "starting LockSettingsService service"
5035 move-object/from16 v0, p0
5036 @@ -2270,12 +2309,12 @@
5038 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5049 const-string v3, "starting DevicePolicyService"
5051 move-object/from16 v0, p0
5052 @@ -2284,12 +2323,12 @@
5054 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5065 const-string v3, "starting StatusBarManagerService"
5067 move-object/from16 v0, p0
5068 @@ -2298,9 +2337,9 @@
5070 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5079 const-string v3, "starting Clipboard Service"
5080 @@ -2311,9 +2350,9 @@
5082 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5091 const-string v3, "starting NetworkManagement Service"
5092 @@ -2324,12 +2363,12 @@
5094 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5105 const-string v3, "starting Text Service Manager Service"
5107 move-object/from16 v0, p0
5108 @@ -2338,12 +2377,12 @@
5110 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5121 const-string v3, "starting NetworkStats Service"
5123 move-object/from16 v0, p0
5124 @@ -2352,14 +2391,14 @@
5126 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5135 move-object/from16 v8, v84
5139 const-string v3, "starting NetworkPolicy Service"
5141 move-object/from16 v0, p0
5142 @@ -2368,12 +2407,12 @@
5144 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5155 const-string v3, "starting Wi-Fi P2pService"
5157 move-object/from16 v0, p0
5158 @@ -2382,12 +2421,12 @@
5160 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5171 const-string v3, "starting Wi-Fi Service"
5173 move-object/from16 v0, p0
5174 @@ -2396,12 +2435,12 @@
5176 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5187 const-string v3, "starting Connectivity Service"
5189 move-object/from16 v0, p0
5190 @@ -2410,9 +2449,9 @@
5192 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5201 const-string v3, "starting Service Discovery Service"
5202 @@ -2423,12 +2462,12 @@
5204 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5215 const-string v3, "starting ThrottleService"
5217 move-object/from16 v0, p0
5218 @@ -2437,9 +2476,9 @@
5220 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5229 const-string v3, "starting UpdateLockService"
5230 @@ -2450,9 +2489,9 @@
5232 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5241 const-string v3, "making Account Manager Service ready"
5242 @@ -2463,9 +2502,9 @@
5244 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5253 const-string v3, "making Content Service ready"
5254 @@ -2476,12 +2515,12 @@
5256 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5267 const-string v3, "starting Notification Manager"
5269 move-object/from16 v0, p0
5270 @@ -2490,9 +2529,9 @@
5272 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5281 const-string v3, "starting DeviceStorageMonitor service"
5282 @@ -2503,12 +2542,12 @@
5284 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5295 const-string v3, "starting Location Manager"
5297 move-object/from16 v0, p0
5298 @@ -2517,12 +2556,12 @@
5300 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5311 const-string v3, "starting Country Detector"
5313 move-object/from16 v0, p0
5314 @@ -2531,9 +2570,9 @@
5316 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5325 const-string v3, "starting Search Service"
5326 @@ -2544,9 +2583,9 @@
5328 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5337 const-string v3, "starting DropBoxManagerService"
5338 @@ -2557,12 +2596,12 @@
5340 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5351 const-string v3, "starting Wallpaper Service"
5353 move-object/from16 v0, p0
5354 @@ -2571,9 +2610,9 @@
5356 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5365 const-string v3, "starting Audio Service"
5366 @@ -2584,9 +2623,9 @@
5368 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5377 const-string v3, "starting DockObserver"
5378 @@ -2597,9 +2636,9 @@
5380 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5389 const-string v3, "starting WiredAccessoryObserver"
5390 @@ -2610,12 +2649,12 @@
5392 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5403 const-string v3, "starting UsbService"
5405 move-object/from16 v0, p0
5406 @@ -2624,12 +2663,12 @@
5408 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5419 const-string v3, "SystemServer"
5421 const-string v9, "Failure starting SerialService"
5422 @@ -2638,9 +2677,9 @@
5424 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5433 const-string v3, "starting UiModeManagerService"
5434 @@ -2651,9 +2690,9 @@
5436 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5445 const-string v3, "SystemServer"
5446 @@ -2664,12 +2703,12 @@
5448 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5459 const-string v3, "starting AppWidget Service"
5461 move-object/from16 v0, p0
5462 @@ -2678,9 +2717,9 @@
5464 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5473 const-string v3, "starting Recognition Service"
5474 @@ -2691,9 +2730,9 @@
5476 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5485 const-string v3, "starting DiskStats Service"
5486 @@ -2704,9 +2743,9 @@
5488 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5497 const-string v3, "starting SamplingProfiler Service"
5498 @@ -2717,9 +2756,9 @@
5500 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5509 const-string v3, "starting NetworkTimeUpdate service"
5510 @@ -2730,12 +2769,12 @@
5512 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5523 const-string v3, "starting CommonTimeManagementService service"
5525 move-object/from16 v0, p0
5526 @@ -2744,9 +2783,9 @@
5528 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5537 const-string v3, "starting CertBlacklister"
5538 @@ -2757,12 +2796,12 @@
5540 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5551 const-string v3, "starting DreamManagerService"
5553 move-object/from16 v0, p0
5554 @@ -2771,9 +2810,9 @@
5556 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5565 const-string v3, "SystemServer"
5566 @@ -2784,18 +2823,18 @@
5568 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5575 invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5577 move-result-object v3
5579 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5588 const-string v3, "making Vibrator Service ready"
5589 @@ -2806,9 +2845,9 @@
5591 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5600 const-string v3, "making Device Policy Service ready"
5601 @@ -2819,9 +2858,9 @@
5603 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5612 const-string v3, "making Notification Service ready"
5613 @@ -2832,9 +2871,9 @@
5615 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5624 const-string v3, "making Window Manager Service ready"
5625 @@ -2845,9 +2884,9 @@
5627 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5636 const-string v3, "making Package Manager Service ready"
5637 @@ -2858,9 +2897,9 @@
5639 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5648 const-string v3, "making Lock Settings Service ready"
5649 @@ -2871,164 +2910,164 @@
5651 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5666 move-object/from16 v65, v66
5675 move-object/from16 v52, v53
5684 move-object/from16 v44, v45
5693 move-object/from16 v97, v98
5702 move-object/from16 v109, v110
5711 move-object/from16 v114, v115
5720 move-object/from16 v58, v59
5729 move-object/from16 v77, v78
5738 move-object/from16 v88, v89
5747 move-object/from16 v103, v104
5756 move-object/from16 v55, v56
5765 move-object/from16 v116, v117
5774 move-object/from16 v118, v119
5790 move-object/from16 v12, v85
5799 move-object/from16 v105, v106
5808 move-object/from16 v101, v102
5817 move-object/from16 v61, v62
5826 move-object/from16 v79, v80
5835 move-object/from16 v82, v83
5851 move-object/from16 v72, v73
5860 move-object/from16 v7, v43
5861 @@ -3037,9 +3076,9 @@
5863 move-object/from16 v6, v92
5872 move-object/from16 v7, v43
5873 @@ -3048,9 +3087,9 @@
5875 move-object/from16 v41, v42
5884 move-object/from16 v7, v43
5885 @@ -3059,18 +3098,18 @@
5887 move-object/from16 v75, v76
5896 move-object/from16 v7, v43
5898 move-object/from16 v75, v76
5907 move-object/from16 v7, v43
5908 @@ -3079,9 +3118,9 @@
5910 move-object/from16 v75, v76
5919 move-object/from16 v47, v48
5920 @@ -3090,9 +3129,9 @@
5922 move-object/from16 v75, v76
5931 move-object/from16 v49, v50
5932 @@ -3103,17 +3142,17 @@
5934 move-object/from16 v75, v76
5943 move-object/from16 v41, v42
5950 move-object/from16 v8, v84
5955 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali ext-services/smali/com/android/server/TelephonyRegistry$1.smali
5956 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali 2012-11-02 22:29:32.583498668 -0500
5957 +++ ext-services/smali/com/android/server/TelephonyRegistry$1.smali 1969-12-31 18:00:00.000000000 -0600
5959 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
5960 -.super Ljava/lang/Object;
5961 -.source "TelephonyRegistry.java"
5965 -.annotation system Ldalvik/annotation/EnclosingClass;
5966 - value = Lcom/android/server/TelephonyRegistry;
5969 -.annotation system Ldalvik/annotation/InnerClass;
5970 - accessFlags = 0x1008
5973 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali ext-services/smali/com/android/server/TelephonyRegistry$Record.smali
5974 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-11-02 22:29:32.587498685 -0500
5975 +++ ext-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-11-02 22:29:46.787569107 -0500
5977 -.class Lcom/android/server/TelephonyRegistry$Record;
5978 +.class public Lcom/android/server/TelephonyRegistry$Record;
5979 .super Ljava/lang/Object;
5980 .source "TelephonyRegistry.java"
5985 .annotation system Ldalvik/annotation/InnerClass;
5995 -.method private constructor <init>()V
5996 +.method public constructor <init>()V
5999 invoke-direct {p0}, Ljava/lang/Object;-><init>()V
6004 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
6007 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6011 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali ext-services/smali/com/android/server/TelephonyRegistry.smali
6012 --- stock-services/smali/com/android/server/TelephonyRegistry.smali 2012-11-02 22:29:32.595498744 -0500
6013 +++ ext-services/smali/com/android/server/TelephonyRegistry.smali 2012-11-02 22:29:46.695568656 -0500
6016 .annotation system Ldalvik/annotation/MemberClasses;
6018 - Lcom/android/server/TelephonyRegistry$1;,
6019 Lcom/android/server/TelephonyRegistry$Record;
6024 .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6026 -.field private mCallForwarding:Z
6027 +.field protected mCallForwarding:Z
6029 -.field private mCallIncomingNumber:Ljava/lang/String;
6030 +.field protected mCallIncomingNumber:Ljava/lang/String;
6032 -.field private mCallState:I
6033 +.field protected mCallState:I
6035 -.field private mCellInfo:Landroid/telephony/CellInfo;
6036 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6038 -.field private mCellLocation:Landroid/os/Bundle;
6039 +.field protected mCellLocation:Landroid/os/Bundle;
6041 .field private mConnectedApns:Ljava/util/ArrayList;
6042 .annotation system Ldalvik/annotation/Signature;
6047 -.field private final mContext:Landroid/content/Context;
6048 +.field protected final mContext:Landroid/content/Context;
6050 -.field private mDataActivity:I
6051 +.field protected mDataActivity:I
6053 .field private mDataConnectionApn:Ljava/lang/String;
6057 .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6059 -.field private mDataConnectionNetworkType:I
6060 +.field protected mDataConnectionNetworkType:I
6062 .field private mDataConnectionPossible:Z
6064 .field private mDataConnectionReason:Ljava/lang/String;
6066 -.field private mDataConnectionState:I
6067 +.field protected mDataConnectionState:I
6069 -.field private mMessageWaiting:Z
6070 +.field protected mMessageWaiting:Z
6072 -.field private mOtaspMode:I
6073 +.field protected mOtaspMode:I
6075 -.field private final mRecords:Ljava/util/ArrayList;
6076 +.field protected final mRecords:Ljava/util/ArrayList;
6077 .annotation system Ldalvik/annotation/Signature;
6079 "Ljava/util/ArrayList",
6084 -.field private final mRemoveList:Ljava/util/ArrayList;
6085 +.field protected final mRemoveList:Ljava/util/ArrayList;
6086 .annotation system Ldalvik/annotation/Signature;
6088 "Ljava/util/ArrayList",
6093 -.field private mServiceState:Landroid/telephony/ServiceState;
6094 +.field protected mServiceState:Landroid/telephony/ServiceState;
6096 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6097 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6101 -.method constructor <init>(Landroid/content/Context;)V
6102 +.method protected constructor <init>(Landroid/content/Context;)V
6110 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6112 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6115 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6117 @@ -391,29 +390,29 @@
6119 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6121 - invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6125 - invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6127 - .catchall {:try_start_4 .. :try_end_d} :catchall_28
6128 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6129 + invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6131 + .catchall {:try_start_4 .. :try_end_9} :catchall_29
6132 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6136 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6138 new-instance v3, Landroid/content/Intent;
6140 - const-string v4, "android.intent.action.SERVICE_STATE"
6141 + const-string v4, "android.intent.action.SIG_STR"
6143 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6145 + const/high16 v4, 0x2000
6147 + invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6149 new-instance v0, Landroid/os/Bundle;
6151 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6153 - invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6154 + invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6156 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6158 @@ -423,21 +422,23 @@
6166 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6178 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6182 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6185 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6187 @@ -446,29 +447,29 @@
6189 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6191 - invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6193 - .catchall {:try_start_4 .. :try_end_9} :catchall_29
6194 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6195 + invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6200 + invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6202 + .catchall {:try_start_4 .. :try_end_d} :catchall_28
6203 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6206 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6208 new-instance v3, Landroid/content/Intent;
6210 - const-string v4, "android.intent.action.SIG_STR"
6211 + const-string v4, "android.intent.action.SERVICE_STATE"
6213 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6215 - const/high16 v4, 0x2000
6217 - invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6219 new-instance v0, Landroid/os/Bundle;
6221 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6223 - invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6224 + invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6226 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6228 @@ -478,20 +479,20 @@
6236 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6248 -.method private checkListenerPermission(I)V
6249 +.method protected checkListenerPermission(I)V
6257 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6258 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6261 iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6262 @@ -602,111 +603,6 @@
6266 -.method private handleRemoveListLocked()V
6269 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6271 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6275 - if-lez v2, :cond_23
6277 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6279 - invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6281 - move-result-object v1
6284 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6288 - if-eqz v2, :cond_1e
6290 - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6292 - move-result-object v0
6294 - check-cast v0, Landroid/os/IBinder;
6296 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6301 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6303 - invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6309 -.method private remove(Landroid/os/IBinder;)V
6312 - iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6317 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6319 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6326 - if-ge v0, v1, :cond_22
6328 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6330 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6332 - move-result-object v2
6334 - check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6336 - iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6338 - if-ne v2, p1, :cond_1f
6340 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6342 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6350 - add-int/lit8 v0, v0, 0x1
6364 - .catchall {:try_start_3 .. :try_end_26} :catchall_24
6371 .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6374 @@ -1204,12 +1100,55 @@
6378 +.method protected handleRemoveListLocked()V
6381 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6383 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6387 + if-lez v2, :cond_23
6389 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6391 + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6393 + move-result-object v1
6396 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6400 + if-eqz v2, :cond_1e
6402 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6404 + move-result-object v0
6406 + check-cast v0, Landroid/os/IBinder;
6408 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6413 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6415 + invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6421 .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6424 - if-eqz p3, :cond_133
6425 + if-eqz p3, :cond_131
6427 - invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6428 + invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6430 iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6432 @@ -1226,7 +1165,7 @@
6434 invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6436 - .catchall {:try_start_9 .. :try_end_12} :catchall_db
6437 + .catchall {:try_start_9 .. :try_end_12} :catchall_da
6441 @@ -1246,7 +1185,7 @@
6443 check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6445 - .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6446 + .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6449 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6450 @@ -1262,7 +1201,7 @@
6452 iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6454 - .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6455 + .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6459 @@ -1281,8 +1220,8 @@
6461 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6463 - .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6464 - .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6465 + .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6466 + .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6470 @@ -1308,8 +1247,8 @@
6472 invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6474 - .catchall {:try_start_40 .. :try_end_50} :catchall_db
6475 - .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6476 + .catchall {:try_start_40 .. :try_end_50} :catchall_da
6477 + .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6481 @@ -1324,8 +1263,8 @@
6483 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6485 - .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6486 - .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6487 + .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6488 + .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6492 @@ -1340,8 +1279,8 @@
6494 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6496 - .catchall {:try_start_5f .. :try_end_66} :catchall_db
6497 - .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6498 + .catchall {:try_start_5f .. :try_end_66} :catchall_da
6499 + .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6503 @@ -1360,8 +1299,8 @@
6505 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6507 - .catchall {:try_start_6a .. :try_end_76} :catchall_db
6508 - .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6509 + .catchall {:try_start_6a .. :try_end_76} :catchall_da
6510 + .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6514 @@ -1378,8 +1317,8 @@
6516 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6518 - .catchall {:try_start_7a .. :try_end_83} :catchall_db
6519 - .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6520 + .catchall {:try_start_7a .. :try_end_83} :catchall_da
6521 + .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6525 @@ -1396,8 +1335,8 @@
6527 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6529 - .catchall {:try_start_87 .. :try_end_90} :catchall_db
6530 - .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6531 + .catchall {:try_start_87 .. :try_end_90} :catchall_da
6532 + .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6536 @@ -1412,8 +1351,8 @@
6538 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6540 - .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6541 - .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6542 + .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6543 + .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6547 @@ -1428,8 +1367,8 @@
6549 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6551 - .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6552 - .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6553 + .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6554 + .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6558 @@ -1444,8 +1383,8 @@
6560 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6562 - .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6563 - .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6564 + .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6565 + .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6569 @@ -1464,15 +1403,15 @@
6571 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6573 - .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6574 - .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6575 + .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6576 + .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6583 - .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6584 + .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6588 @@ -1488,13 +1427,11 @@
6590 new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6594 - invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6596 - .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6597 + invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6599 + .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6603 iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6605 iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6606 @@ -1507,133 +1444,133 @@
6618 - .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6620 + .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6630 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6632 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6633 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6641 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6643 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6644 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
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
6719 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6721 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6722 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6730 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6732 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6733 + 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
6745 - .catchall {:try_start_df .. :try_end_132} :catchall_db
6746 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6748 + .catchall {:try_start_de .. :try_end_130} :catchall_da
6754 invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6756 move-result-object v8
6758 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6759 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6773 .method public notifyCallForwardingChanged(Z)V
6774 @@ -1641,7 +1578,7 @@
6776 const-string v3, "notifyCallForwardingChanged()"
6778 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6779 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6783 @@ -1719,7 +1656,7 @@
6787 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6788 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6792 @@ -1733,7 +1670,7 @@
6794 const-string v3, "notifyCallState()"
6796 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6797 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6801 @@ -1813,7 +1750,7 @@
6805 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6806 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6810 @@ -1829,7 +1766,7 @@
6812 const-string v3, "notifyCellInfo()"
6814 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6815 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6819 @@ -1911,7 +1848,7 @@
6823 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6824 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6828 @@ -1925,7 +1862,7 @@
6830 const-string v3, "notifyCellLocation()"
6832 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6833 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6837 @@ -2007,7 +1944,7 @@
6841 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6842 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6846 @@ -2021,7 +1958,7 @@
6848 const-string v3, "notifyDataActivity()"
6850 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6851 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6855 @@ -2099,7 +2036,7 @@
6859 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6860 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6864 @@ -2113,7 +2050,7 @@
6866 const-string v1, "notifyDataConnection()"
6868 - invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6869 + invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6873 @@ -2281,7 +2218,7 @@
6877 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6878 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6882 @@ -2316,7 +2253,7 @@
6884 const-string v0, "notifyDataConnectionFailed()"
6886 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6887 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6891 @@ -2336,7 +2273,7 @@
6893 const-string v3, "notifyMessageWaitingChanged()"
6895 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6896 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6900 @@ -2414,7 +2351,7 @@
6904 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6905 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6909 @@ -2428,7 +2365,7 @@
6911 const-string v3, "notifyOtaspChanged()"
6913 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6914 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6918 @@ -2506,7 +2443,7 @@
6922 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6923 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6927 @@ -2516,11 +2453,11 @@
6930 .method public notifyServiceState(Landroid/telephony/ServiceState;)V
6934 const-string v3, "notifyServiceState()"
6936 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6937 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6941 @@ -2537,19 +2474,29 @@
6943 iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6945 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
6947 + const-string v5, ""
6949 + const-string v6, ""
6951 + const-string v7, ""
6953 + invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6955 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6957 invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6959 move-result-object v1
6965 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6969 - if-eqz v3, :cond_3d
6970 + if-eqz v3, :cond_51
6972 invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6974 @@ -2558,14 +2505,22 @@
6975 check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6977 iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
6979 - .catchall {:try_start_c .. :try_end_22} :catchall_3a
6981 + .catchall {:try_start_c .. :try_end_2d} :catchall_4e
6983 and-int/lit8 v3, v3, 0x1
6985 - if-eqz v3, :cond_14
6986 + if-eqz v3, :cond_1f
6989 + const-string v3, ""
6991 + const-string v5, ""
6993 + const-string v6, ""
6995 + invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
6998 iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
7000 new-instance v5, Landroid/telephony/ServiceState;
7001 @@ -2573,42 +2528,42 @@
7002 invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
7004 invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
7006 - .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7007 - .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7009 + .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7010 + .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7021 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7023 iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7025 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7036 - .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7038 + .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7044 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7047 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7051 - .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7053 + .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7055 - invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7056 + invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7060 @@ -2618,7 +2573,7 @@
7062 const-string v4, "notifySignalStrength()"
7064 - invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7065 + invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7069 @@ -2741,7 +2696,7 @@
7073 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7074 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7078 @@ -2751,3 +2706,63 @@
7083 +.method protected remove(Landroid/os/IBinder;)V
7086 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7091 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7093 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7100 + if-ge v0, v1, :cond_22
7102 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7104 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7106 + move-result-object v2
7108 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7110 + iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7112 + if-ne v2, p1, :cond_1f
7114 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7116 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7124 + add-int/lit8 v0, v0, 0x1
7138 + .catchall {:try_start_3 .. :try_end_26} :catchall_24