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-10-12 12:27:14.565334205 -0500
3 +++ ext-services/smali/com/android/server/am/BroadcastQueue.smali 2012-10-12 14:19:32.590746280 -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-10-12 14:19:32.046743565 -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-10-12 14:19:32.062743646 -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-10-12 12:27:13.801330417 -0500
3252 +++ ext-services/smali/com/android/server/ServerThread.smali 2012-10-12 14:19:32.090743782 -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_71d
3300 + if-ne v3, v9, :cond_722
3308 - if-le v3, v9, :cond_721
3309 + if-le v3, v9, :cond_726
3317 - if-eqz v3, :cond_725
3318 + if-eqz v3, :cond_72a
3324 invoke-direct {v6}, Lcom/android/server/PowerManagerService;-><init>()V
3326 - .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_abf
3327 + .catch Ljava/lang/RuntimeException; {:try_start_a5 .. :try_end_c2} :catch_ac4
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_72b
3348 + if-eqz v3, :cond_730
3350 const-string v3, "SystemServer"
3356 - if-eqz v69, :cond_740
3357 + if-eqz v69, :cond_745
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_c2 .. :try_end_121} :catch_74f
3366 + .catch Ljava/lang/RuntimeException; {:try_start_c2 .. :try_end_121} :catch_754
3368 move-result-object v93
3372 invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->isFirstBoot()Z
3374 - .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a4e
3375 - .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_74f
3376 + .catch Landroid/os/RemoteException; {:try_start_124 .. :try_end_127} :catch_a53
3377 + .catch Ljava/lang/RuntimeException; {:try_start_124 .. :try_end_127} :catch_754
3383 iput-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
3385 - .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_74f
3386 + .catch Ljava/lang/RuntimeException; {:try_start_128 .. :try_end_133} :catch_754
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_133 .. :try_end_141} :catch_743
3395 - .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_74f
3396 + .catch Ljava/lang/Throwable; {:try_start_133 .. :try_end_141} :catch_748
3397 + .catch Ljava/lang/RuntimeException; {:try_start_133 .. :try_end_141} :catch_754
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_141 .. :try_end_148} :catch_afe
3406 - .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_ac8
3407 + .catch Ljava/lang/Throwable; {:try_start_141 .. :try_end_148} :catch_b03
3408 + .catch Ljava/lang/RuntimeException; {:try_start_141 .. :try_end_148} :catch_acd
3410 move-object/from16 v42, v43
3416 - if-ne v0, v3, :cond_766
3417 + if-ne v0, v3, :cond_76b
3421 @@ -479,6 +514,10 @@
3423 move-result-object v58
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 @@ -498,10 +537,10 @@
3433 move-object/from16 v0, v78
3435 invoke-direct {v0, v4}, Lcom/android/server/LightsService;-><init>(Landroid/content/Context;)V
3437 - .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_173} :catch_74f
3439 + .catch Ljava/lang/RuntimeException; {:try_start_14a .. :try_end_178} :catch_754
3443 const-string v3, "SystemServer"
3445 const-string v9, "Battery Service"
3446 @@ -513,10 +552,10 @@
3447 move-object/from16 v0, v78
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_173 .. :try_end_181} :catch_ad1
3453 + .catch Ljava/lang/RuntimeException; {:try_start_178 .. :try_end_186} :catch_ad6
3457 const-string v3, "battery"
3459 invoke-static {v3, v5}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3460 @@ -532,10 +571,10 @@
3461 move-object/from16 v0, v118
3463 invoke-direct {v0, v4}, Lcom/android/server/VibratorService;-><init>(Landroid/content/Context;)V
3465 - .catch Ljava/lang/RuntimeException; {:try_start_181 .. :try_end_194} :catch_ada
3467 + .catch Ljava/lang/RuntimeException; {:try_start_186 .. :try_end_199} :catch_adf
3471 const-string v3, "vibrator"
3473 move-object/from16 v0, v118
3474 @@ -559,10 +598,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_194 .. :try_end_1b0} :catch_ae1
3481 + .catch Ljava/lang/RuntimeException; {:try_start_199 .. :try_end_1b5} :catch_ae6
3485 const-string v3, "alarm"
3487 invoke-static {v3, v7}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3488 @@ -593,18 +632,18 @@
3492 - if-eq v0, v3, :cond_769
3493 + if-eq v0, v3, :cond_76e
3500 - if-nez v72, :cond_76d
3502 + if-nez v72, :cond_772
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 @@ -647,22 +686,22 @@
3515 - if-eqz v3, :cond_770
3516 + if-eqz v3, :cond_775
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_1b0 .. :try_end_20e} :catch_77e
3526 + .catch Ljava/lang/RuntimeException; {:try_start_1b5 .. :try_end_213} :catch_783
3530 move-object/from16 v117, v118
3532 move-object/from16 v77, v78
3536 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
3538 move-result-object v3
3543 - if-eq v0, v3, :cond_264
3544 + if-eq v0, v3, :cond_269
3548 const-string v3, "SystemServer"
3550 const-string v9, "Input Method Service"
3551 @@ -717,22 +756,22 @@
3552 move-object/from16 v1, v126
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_23a .. :try_end_24a} :catch_7d3
3558 + .catch Ljava/lang/Throwable; {:try_start_23f .. :try_end_24f} :catch_7d8
3562 const-string v3, "input_method"
3564 move-object/from16 v0, v75
3566 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3568 - .catch Ljava/lang/Throwable; {:try_start_24a .. :try_end_251} :catch_aba
3570 + .catch Ljava/lang/Throwable; {:try_start_24f .. :try_end_256} :catch_abf
3572 move-object/from16 v74, v75
3578 const-string v3, "SystemServer"
3580 const-string v9, "Accessibility Manager"
3581 @@ -746,24 +785,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_253 .. :try_end_264} :catch_7df
3588 + .catch Ljava/lang/Throwable; {:try_start_258 .. :try_end_269} :catch_7e4
3596 invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->displayReady()V
3598 - .catch Ljava/lang/Throwable; {:try_start_264 .. :try_end_267} :catch_7eb
3600 + .catch Ljava/lang/Throwable; {:try_start_269 .. :try_end_26c} :catch_7f0
3606 invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->performBootDexOpt()V
3608 - .catch Ljava/lang/Throwable; {:try_start_267 .. :try_end_26a} :catch_7f7
3610 + .catch Ljava/lang/Throwable; {:try_start_26c .. :try_end_26f} :catch_7fc
3616 invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
3618 move-result-object v3
3619 @@ -781,15 +820,15 @@
3622 invoke-interface {v3, v9, v10}, Landroid/app/IActivityManager;->showBootMessage(Ljava/lang/CharSequence;Z)V
3624 - .catch Landroid/os/RemoteException; {:try_start_26a .. :try_end_27d} :catch_ab7
3626 + .catch Landroid/os/RemoteException; {:try_start_26f .. :try_end_282} :catch_abc
3634 - if-eq v0, v3, :cond_b03
3635 + if-eq v0, v3, :cond_b08
3643 - if-nez v3, :cond_2a9
3644 + if-nez v3, :cond_2ae
3648 const-string v3, "SystemServer"
3650 const-string v9, "Mount Service"
3651 @@ -819,23 +858,23 @@
3652 move-object/from16 v0, v85
3654 invoke-direct {v0, v4}, Lcom/android/server/MountService;-><init>(Landroid/content/Context;)V
3656 - .catch Ljava/lang/Throwable; {:try_start_292 .. :try_end_2a0} :catch_803
3658 + .catch Ljava/lang/Throwable; {:try_start_297 .. :try_end_2a5} :catch_808
3662 const-string v3, "mount"
3664 move-object/from16 v0, v85
3666 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3668 - .catch Ljava/lang/Throwable; {:try_start_2a0 .. :try_end_2a7} :catch_ab2
3670 + .catch Ljava/lang/Throwable; {:try_start_2a5 .. :try_end_2ac} :catch_ab7
3672 move-object/from16 v84, v85
3680 const-string v3, "SystemServer"
3682 const-string v9, "LockSettingsService"
3683 @@ -847,22 +886,22 @@
3684 move-object/from16 v0, v82
3686 invoke-direct {v0, v4}, Lcom/android/internal/widget/LockSettingsService;-><init>(Landroid/content/Context;)V
3688 - .catch Ljava/lang/Throwable; {:try_start_2a9 .. :try_end_2b7} :catch_80f
3690 + .catch Ljava/lang/Throwable; {:try_start_2ae .. :try_end_2bc} :catch_814
3694 const-string v3, "lock_settings"
3696 move-object/from16 v0, v82
3698 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3700 - .catch Ljava/lang/Throwable; {:try_start_2b7 .. :try_end_2be} :catch_aad
3702 + .catch Ljava/lang/Throwable; {:try_start_2bc .. :try_end_2c3} :catch_ab2
3704 move-object/from16 v81, v82
3710 const-string v3, "SystemServer"
3712 const-string v9, "Device Policy"
3713 @@ -874,22 +913,22 @@
3714 move-object/from16 v0, v63
3716 invoke-direct {v0, v4}, Lcom/android/server/DevicePolicyManagerService;-><init>(Landroid/content/Context;)V
3718 - .catch Ljava/lang/Throwable; {:try_start_2c0 .. :try_end_2ce} :catch_81b
3720 + .catch Ljava/lang/Throwable; {:try_start_2c5 .. :try_end_2d3} :catch_820
3724 const-string v3, "device_policy"
3726 move-object/from16 v0, v63
3728 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3730 - .catch Ljava/lang/Throwable; {:try_start_2ce .. :try_end_2d5} :catch_aa8
3732 + .catch Ljava/lang/Throwable; {:try_start_2d3 .. :try_end_2da} :catch_aad
3734 move-object/from16 v62, v63
3740 const-string v3, "SystemServer"
3742 const-string v9, "Status Bar"
3743 @@ -903,22 +942,22 @@
3744 move-object/from16 v1, v126
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_2d7 .. :try_end_2e7} :catch_827
3750 + .catch Ljava/lang/Throwable; {:try_start_2dc .. :try_end_2ec} :catch_82c
3754 const-string v3, "statusbar"
3756 move-object/from16 v0, v108
3758 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3760 - .catch Ljava/lang/Throwable; {:try_start_2e7 .. :try_end_2ee} :catch_aa3
3762 + .catch Ljava/lang/Throwable; {:try_start_2ec .. :try_end_2f3} :catch_aa8
3764 move-object/from16 v107, v108
3770 const-string v3, "SystemServer"
3772 const-string v9, "Clipboard Service"
3773 @@ -932,11 +971,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_2f0 .. :try_end_301} :catch_833
3780 + .catch Ljava/lang/Throwable; {:try_start_2f5 .. :try_end_306} :catch_838
3786 const-string v3, "SystemServer"
3788 const-string v9, "NetworkManagement Service"
3789 @@ -950,11 +989,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_301 .. :try_end_311} :catch_83f
3796 + .catch Ljava/lang/Throwable; {:try_start_306 .. :try_end_316} :catch_844
3802 const-string v3, "SystemServer"
3804 const-string v9, "Text Service Manager Service"
3805 @@ -966,22 +1005,22 @@
3806 move-object/from16 v0, v112
3808 invoke-direct {v0, v4}, Lcom/android/server/TextServicesManagerService;-><init>(Landroid/content/Context;)V
3810 - .catch Ljava/lang/Throwable; {:try_start_311 .. :try_end_31f} :catch_84b
3812 + .catch Ljava/lang/Throwable; {:try_start_316 .. :try_end_324} :catch_850
3816 const-string v3, "textservices"
3818 move-object/from16 v0, v112
3820 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3822 - .catch Ljava/lang/Throwable; {:try_start_31f .. :try_end_326} :catch_a9e
3824 + .catch Ljava/lang/Throwable; {:try_start_324 .. :try_end_32b} :catch_aa3
3826 move-object/from16 v111, v112
3832 const-string v3, "SystemServer"
3834 const-string v9, "NetworkStats Service"
3835 @@ -993,22 +1032,22 @@
3836 move-object/from16 v0, v87
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_328 .. :try_end_336} :catch_857
3842 + .catch Ljava/lang/Throwable; {:try_start_32d .. :try_end_33b} :catch_85c
3846 const-string v3, "netstats"
3848 move-object/from16 v0, v87
3850 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3852 - .catch Ljava/lang/Throwable; {:try_start_336 .. :try_end_33d} :catch_a99
3854 + .catch Ljava/lang/Throwable; {:try_start_33b .. :try_end_342} :catch_a9e
3856 move-object/from16 v12, v87
3862 const-string v3, "SystemServer"
3864 const-string v9, "NetworkPolicy Service"
3865 @@ -1026,18 +1065,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_33f .. :try_end_351} :catch_863
3872 + .catch Ljava/lang/Throwable; {:try_start_344 .. :try_end_356} :catch_868
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_351 .. :try_end_356} :catch_a96
3882 + .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_35b} :catch_a9b
3888 const-string v3, "SystemServer"
3890 const-string v9, "Wi-Fi P2pService"
3891 @@ -1049,22 +1088,22 @@
3892 move-object/from16 v0, v125
3894 invoke-direct {v0, v4}, Landroid/net/wifi/p2p/WifiP2pService;-><init>(Landroid/content/Context;)V
3896 - .catch Ljava/lang/Throwable; {:try_start_356 .. :try_end_364} :catch_871
3898 + .catch Ljava/lang/Throwable; {:try_start_35b .. :try_end_369} :catch_876
3902 const-string v3, "wifip2p"
3904 move-object/from16 v0, v125
3906 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3908 - .catch Ljava/lang/Throwable; {:try_start_364 .. :try_end_36b} :catch_a91
3910 + .catch Ljava/lang/Throwable; {:try_start_369 .. :try_end_370} :catch_a96
3912 move-object/from16 v124, v125
3918 const-string v3, "SystemServer"
3920 const-string v9, "Wi-Fi Service"
3921 @@ -1076,22 +1115,22 @@
3922 move-object/from16 v0, v123
3924 invoke-direct {v0, v4}, Lcom/android/server/WifiService;-><init>(Landroid/content/Context;)V
3926 - .catch Ljava/lang/Throwable; {:try_start_36d .. :try_end_37b} :catch_87d
3928 + .catch Ljava/lang/Throwable; {:try_start_372 .. :try_end_380} :catch_882
3932 const-string v3, "wifi"
3934 move-object/from16 v0, v123
3936 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3938 - .catch Ljava/lang/Throwable; {:try_start_37b .. :try_end_382} :catch_a8c
3940 + .catch Ljava/lang/Throwable; {:try_start_380 .. :try_end_387} :catch_a91
3942 move-object/from16 v122, v123
3948 const-string v3, "SystemServer"
3950 const-string v9, "Connectivity Service"
3951 @@ -1103,10 +1142,10 @@
3952 move-object/from16 v0, v57
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_384 .. :try_end_392} :catch_889
3958 + .catch Ljava/lang/Throwable; {:try_start_389 .. :try_end_397} :catch_88e
3962 const-string v3, "connectivity"
3964 move-object/from16 v0, v57
3965 @@ -1124,13 +1163,13 @@
3966 invoke-virtual/range {v122 .. v122}, Lcom/android/server/WifiService;->checkAndStartWifi()V
3968 invoke-virtual/range {v124 .. v124}, Landroid/net/wifi/p2p/WifiP2pService;->connectivityServiceReady()V
3970 - .catch Ljava/lang/Throwable; {:try_start_392 .. :try_end_3a9} :catch_a87
3972 + .catch Ljava/lang/Throwable; {:try_start_397 .. :try_end_3ae} :catch_a8c
3974 move-object/from16 v56, v57
3980 const-string v3, "SystemServer"
3982 const-string v9, "Network Service Discovery Service"
3983 @@ -1146,11 +1185,11 @@
3984 move-object/from16 v0, v105
3986 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
3988 - .catch Ljava/lang/Throwable; {:try_start_3ab .. :try_end_3bd} :catch_895
3990 + .catch Ljava/lang/Throwable; {:try_start_3b0 .. :try_end_3c2} :catch_89a
3996 const-string v3, "SystemServer"
3998 const-string v9, "Throttle Service"
3999 @@ -1162,22 +1201,22 @@
4000 move-object/from16 v0, v110
4002 invoke-direct {v0, v4}, Lcom/android/server/ThrottleService;-><init>(Landroid/content/Context;)V
4004 - .catch Ljava/lang/Throwable; {:try_start_3bd .. :try_end_3cb} :catch_8a1
4006 + .catch Ljava/lang/Throwable; {:try_start_3c2 .. :try_end_3d0} :catch_8a6
4010 const-string v3, "throttle"
4012 move-object/from16 v0, v110
4014 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4016 - .catch Ljava/lang/Throwable; {:try_start_3cb .. :try_end_3d2} :catch_a82
4018 + .catch Ljava/lang/Throwable; {:try_start_3d0 .. :try_end_3d7} :catch_a87
4020 move-object/from16 v109, v110
4026 const-string v3, "SystemServer"
4028 const-string v9, "UpdateLock Service"
4029 @@ -1191,16 +1230,16 @@
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_3d4 .. :try_end_3e5} :catch_8ad
4036 + .catch Ljava/lang/Throwable; {:try_start_3d9 .. :try_end_3ea} :catch_8b2
4039 - if-eqz v84, :cond_3ea
4041 + if-eqz v84, :cond_3ef
4043 invoke-virtual/range {v84 .. v84}, Lcom/android/server/MountService;->waitForAsecScan()V
4049 const-string v3, "SystemServer"
4051 const-string v9, "Profile Manager"
4052 @@ -1212,40 +1251,40 @@
4053 move-object/from16 v0, v96
4055 invoke-direct {v0, v4}, Lcom/android/server/ProfileManagerService;-><init>(Landroid/content/Context;)V
4057 - .catch Ljava/lang/Throwable; {:try_start_3ea .. :try_end_3f8} :catch_8b9
4059 + .catch Ljava/lang/Throwable; {:try_start_3ef .. :try_end_3fd} :catch_8be
4063 const-string v3, "profile"
4065 move-object/from16 v0, v96
4067 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4069 - .catch Ljava/lang/Throwable; {:try_start_3f8 .. :try_end_3ff} :catch_a7d
4071 + .catch Ljava/lang/Throwable; {:try_start_3fd .. :try_end_404} :catch_a82
4073 move-object/from16 v95, v96
4076 - if-eqz v42, :cond_406
4079 - invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
4081 - .catch Ljava/lang/Throwable; {:try_start_403 .. :try_end_406} :catch_8c5
4085 - if-eqz v58, :cond_40b
4086 + if-eqz v42, :cond_40b
4089 - invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
4090 + invoke-virtual/range {v42 .. v42}, Landroid/accounts/AccountManagerService;->systemReady()V
4092 - .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8d1
4093 + .catch Ljava/lang/Throwable; {:try_start_408 .. :try_end_40b} :catch_8ca
4098 + if-eqz v58, :cond_410
4101 + invoke-virtual/range {v58 .. v58}, Landroid/content/ContentService;->systemReady()V
4103 + .catch Ljava/lang/Throwable; {:try_start_40d .. :try_end_410} :catch_8d6
4108 const-string v3, "SystemServer"
4110 const-string v9, "Notification Manager"
4111 @@ -1261,10 +1300,10 @@
4112 move-object/from16 v2, v77
4114 invoke-direct {v0, v4, v1, v2}, Lcom/android/server/NotificationManagerService;-><init>(Landroid/content/Context;Lcom/android/server/StatusBarManagerService;Lcom/android/server/LightsService;)V
4116 - .catch Ljava/lang/Throwable; {:try_start_40b .. :try_end_41d} :catch_8dd
4118 + .catch Ljava/lang/Throwable; {:try_start_410 .. :try_end_422} :catch_8e2
4122 const-string v3, "notification"
4124 move-object/from16 v0, v91
4125 @@ -1274,13 +1313,13 @@
4126 move-object/from16 v0, v91
4128 invoke-virtual {v8, v0}, Lcom/android/server/net/NetworkPolicyManagerService;->bindNotificationManager(Landroid/app/INotificationManager;)V
4130 - .catch Ljava/lang/Throwable; {:try_start_41d .. :try_end_429} :catch_a78
4132 + .catch Ljava/lang/Throwable; {:try_start_422 .. :try_end_42e} :catch_a7d
4134 move-object/from16 v90, v91
4140 const-string v3, "SystemServer"
4142 const-string v9, "Device Storage Monitor"
4143 @@ -1294,11 +1333,11 @@
4144 invoke-direct {v9, v4}, Lcom/android/server/DeviceStorageMonitorService;-><init>(Landroid/content/Context;)V
4146 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4148 - .catch Ljava/lang/Throwable; {:try_start_42b .. :try_end_43c} :catch_8e9
4150 + .catch Ljava/lang/Throwable; {:try_start_430 .. :try_end_441} :catch_8ee
4156 const-string v3, "SystemServer"
4158 const-string v9, "Location Manager"
4159 @@ -1310,22 +1349,22 @@
4160 move-object/from16 v0, v80
4162 invoke-direct {v0, v4}, Lcom/android/server/LocationManagerService;-><init>(Landroid/content/Context;)V
4164 - .catch Ljava/lang/Throwable; {:try_start_43c .. :try_end_44a} :catch_8f5
4166 + .catch Ljava/lang/Throwable; {:try_start_441 .. :try_end_44f} :catch_8fa
4170 const-string v3, "location"
4172 move-object/from16 v0, v80
4174 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4176 - .catch Ljava/lang/Throwable; {:try_start_44a .. :try_end_451} :catch_a73
4178 + .catch Ljava/lang/Throwable; {:try_start_44f .. :try_end_456} :catch_a78
4180 move-object/from16 v79, v80
4186 const-string v3, "SystemServer"
4188 const-string v9, "Country Detector"
4189 @@ -1337,22 +1376,22 @@
4190 move-object/from16 v0, v60
4192 invoke-direct {v0, v4}, Lcom/android/server/CountryDetectorService;-><init>(Landroid/content/Context;)V
4194 - .catch Ljava/lang/Throwable; {:try_start_453 .. :try_end_461} :catch_901
4196 + .catch Ljava/lang/Throwable; {:try_start_458 .. :try_end_466} :catch_906
4200 const-string v3, "country_detector"
4202 move-object/from16 v0, v60
4204 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4206 - .catch Ljava/lang/Throwable; {:try_start_461 .. :try_end_468} :catch_a6e
4208 + .catch Ljava/lang/Throwable; {:try_start_466 .. :try_end_46d} :catch_a73
4210 move-object/from16 v59, v60
4216 const-string v3, "SystemServer"
4218 const-string v9, "Search Service"
4219 @@ -1366,11 +1405,11 @@
4220 invoke-direct {v9, v4}, Landroid/server/search/SearchManagerService;-><init>(Landroid/content/Context;)V
4222 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4224 - .catch Ljava/lang/Throwable; {:try_start_46a .. :try_end_47b} :catch_90d
4226 + .catch Ljava/lang/Throwable; {:try_start_46f .. :try_end_480} :catch_912
4232 const-string v3, "SystemServer"
4234 const-string v9, "DropBox Service"
4235 @@ -1390,10 +1429,10 @@
4236 invoke-direct {v9, v4, v10}, Lcom/android/server/DropBoxManagerService;-><init>(Landroid/content/Context;Ljava/io/File;)V
4238 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4240 - .catch Ljava/lang/Throwable; {:try_start_47b .. :try_end_493} :catch_919
4242 + .catch Ljava/lang/Throwable; {:try_start_480 .. :try_end_498} :catch_91e
4246 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4248 move-result-object v3
4249 @@ -1404,38 +1443,38 @@
4253 - if-eqz v3, :cond_4b9
4254 + if-eqz v3, :cond_4be
4258 const-string v3, "SystemServer"
4260 const-string v9, "Wallpaper Service"
4262 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4264 - if-nez v16, :cond_4b9
4265 + if-nez v16, :cond_4be
4267 new-instance v121, Lcom/android/server/WallpaperManagerService;
4269 move-object/from16 v0, v121
4271 invoke-direct {v0, v4}, Lcom/android/server/WallpaperManagerService;-><init>(Landroid/content/Context;)V
4273 - .catch Ljava/lang/Throwable; {:try_start_4a0 .. :try_end_4b0} :catch_925
4275 + .catch Ljava/lang/Throwable; {:try_start_4a5 .. :try_end_4b5} :catch_92a
4279 const-string v3, "wallpaper"
4281 move-object/from16 v0, v121
4283 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4285 - .catch Ljava/lang/Throwable; {:try_start_4b0 .. :try_end_4b7} :catch_a69
4287 + .catch Ljava/lang/Throwable; {:try_start_4b5 .. :try_end_4bc} :catch_a6e
4289 move-object/from16 v120, v121
4295 const-string v3, "0"
4297 const-string v9, "system_init.startaudioservice"
4298 @@ -1448,9 +1487,9 @@
4302 - if-nez v3, :cond_4d8
4303 + if-nez v3, :cond_4dd
4307 const-string v3, "SystemServer"
4309 const-string v9, "Audio Service"
4310 @@ -1464,12 +1503,12 @@
4311 invoke-direct {v9, v4}, Landroid/media/AudioService;-><init>(Landroid/content/Context;)V
4313 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4315 - .catch Ljava/lang/Throwable; {:try_start_4c7 .. :try_end_4d8} :catch_931
4317 + .catch Ljava/lang/Throwable; {:try_start_4cc .. :try_end_4dd} :catch_936
4325 const-string v3, "SystemServer"
4327 const-string v9, "Dock Observer"
4328 @@ -1481,15 +1520,15 @@
4329 move-object/from16 v0, v65
4331 invoke-direct {v0, v4, v6}, Lcom/android/server/DockObserver;-><init>(Landroid/content/Context;Lcom/android/server/PowerManagerService;)V
4333 - .catch Ljava/lang/Throwable; {:try_start_4d8 .. :try_end_4e6} :catch_93d
4335 + .catch Ljava/lang/Throwable; {:try_start_4dd .. :try_end_4eb} :catch_942
4337 move-object/from16 v64, v65
4340 - if-eqz v73, :cond_4fa
4342 + if-eqz v73, :cond_4ff
4346 const-string v3, "SystemServer"
4348 const-string v9, "Rotation Switch Observer"
4349 @@ -1501,14 +1540,14 @@
4350 move-object/from16 v0, v102
4352 invoke-direct {v0, v4}, Lcom/android/server/RotationSwitchObserver;-><init>(Landroid/content/Context;)V
4354 - .catch Ljava/lang/Throwable; {:try_start_4ea .. :try_end_4f8} :catch_949
4356 + .catch Ljava/lang/Throwable; {:try_start_4ef .. :try_end_4fd} :catch_94e
4358 move-object/from16 v101, v102
4366 const-string v3, "SystemServer"
4368 const-string v9, "Wired Accessory Observer"
4369 @@ -1518,11 +1557,11 @@
4370 new-instance v3, Lcom/android/server/WiredAccessoryObserver;
4372 invoke-direct {v3, v4}, Lcom/android/server/WiredAccessoryObserver;-><init>(Landroid/content/Context;)V
4374 - .catch Ljava/lang/Throwable; {:try_start_4fa .. :try_end_506} :catch_955
4376 + .catch Ljava/lang/Throwable; {:try_start_4ff .. :try_end_50b} :catch_95a
4382 const-string v3, "SystemServer"
4384 const-string v9, "USB Service"
4385 @@ -1534,22 +1573,22 @@
4386 move-object/from16 v0, v116
4388 invoke-direct {v0, v4}, Lcom/android/server/usb/UsbService;-><init>(Landroid/content/Context;)V
4390 - .catch Ljava/lang/Throwable; {:try_start_506 .. :try_end_514} :catch_961
4392 + .catch Ljava/lang/Throwable; {:try_start_50b .. :try_end_519} :catch_966
4396 const-string v3, "usb"
4398 move-object/from16 v0, v116
4400 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4402 - .catch Ljava/lang/Throwable; {:try_start_514 .. :try_end_51b} :catch_a64
4404 + .catch Ljava/lang/Throwable; {:try_start_519 .. :try_end_520} :catch_a69
4406 move-object/from16 v115, v116
4412 const-string v3, "SystemServer"
4414 const-string v9, "Serial Service"
4415 @@ -1561,22 +1600,22 @@
4416 move-object/from16 v0, v104
4418 invoke-direct {v0, v4}, Lcom/android/server/SerialService;-><init>(Landroid/content/Context;)V
4420 - .catch Ljava/lang/Throwable; {:try_start_51d .. :try_end_52b} :catch_96d
4422 + .catch Ljava/lang/Throwable; {:try_start_522 .. :try_end_530} :catch_972
4426 const-string v3, "serial"
4428 move-object/from16 v0, v104
4430 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4432 - .catch Ljava/lang/Throwable; {:try_start_52b .. :try_end_532} :catch_a5f
4434 + .catch Ljava/lang/Throwable; {:try_start_530 .. :try_end_537} :catch_a64
4436 move-object/from16 v103, v104
4442 const-string v3, "SystemServer"
4444 const-string v9, "UI Mode Manager Service"
4445 @@ -1588,13 +1627,13 @@
4446 move-object/from16 v0, v114
4448 invoke-direct {v0, v4}, Lcom/android/server/UiModeManagerService;-><init>(Landroid/content/Context;)V
4450 - .catch Ljava/lang/Throwable; {:try_start_534 .. :try_end_542} :catch_979
4452 + .catch Ljava/lang/Throwable; {:try_start_539 .. :try_end_547} :catch_97e
4454 move-object/from16 v113, v114
4460 const-string v3, "SystemServer"
4462 const-string v9, "Backup Service"
4463 @@ -1608,11 +1647,11 @@
4464 invoke-direct {v9, v4}, Lcom/android/server/BackupManagerService;-><init>(Landroid/content/Context;)V
4466 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4468 - .catch Ljava/lang/Throwable; {:try_start_544 .. :try_end_555} :catch_985
4470 + .catch Ljava/lang/Throwable; {:try_start_549 .. :try_end_55a} :catch_98a
4476 const-string v3, "SystemServer"
4478 const-string v9, "AppWidget Service"
4479 @@ -1624,22 +1663,22 @@
4480 move-object/from16 v0, v46
4482 invoke-direct {v0, v4}, Lcom/android/server/AppWidgetService;-><init>(Landroid/content/Context;)V
4484 - .catch Ljava/lang/Throwable; {:try_start_555 .. :try_end_563} :catch_991
4486 + .catch Ljava/lang/Throwable; {:try_start_55a .. :try_end_568} :catch_996
4490 const-string v3, "appwidget"
4492 move-object/from16 v0, v46
4494 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4496 - .catch Ljava/lang/Throwable; {:try_start_563 .. :try_end_56a} :catch_a5a
4498 + .catch Ljava/lang/Throwable; {:try_start_568 .. :try_end_56f} :catch_a5f
4500 move-object/from16 v45, v46
4506 const-string v3, "SystemServer"
4508 const-string v9, "Recognition Service"
4509 @@ -1651,13 +1690,13 @@
4510 move-object/from16 v0, v100
4512 invoke-direct {v0, v4}, Lcom/android/server/RecognitionManagerService;-><init>(Landroid/content/Context;)V
4514 - .catch Ljava/lang/Throwable; {:try_start_56c .. :try_end_57a} :catch_99d
4516 + .catch Ljava/lang/Throwable; {:try_start_571 .. :try_end_57f} :catch_9a2
4518 move-object/from16 v99, v100
4524 const-string v3, "SystemServer"
4526 const-string v9, "DiskStats Service"
4527 @@ -1671,11 +1710,11 @@
4528 invoke-direct {v9, v4}, Lcom/android/server/DiskStatsService;-><init>(Landroid/content/Context;)V
4530 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4532 - .catch Ljava/lang/Throwable; {:try_start_57c .. :try_end_58d} :catch_9a9
4534 + .catch Ljava/lang/Throwable; {:try_start_581 .. :try_end_592} :catch_9ae
4540 const-string v3, "SystemServer"
4542 const-string v9, "SamplingProfiler Service"
4543 @@ -1689,11 +1728,11 @@
4544 invoke-direct {v9, v4}, Lcom/android/server/SamplingProfilerService;-><init>(Landroid/content/Context;)V
4546 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4548 - .catch Ljava/lang/Throwable; {:try_start_58d .. :try_end_59e} :catch_9b5
4550 + .catch Ljava/lang/Throwable; {:try_start_592 .. :try_end_5a3} :catch_9ba
4556 const-string v3, "SystemServer"
4558 const-string v9, "NetworkTimeUpdateService"
4559 @@ -1705,13 +1744,13 @@
4560 move-object/from16 v0, v89
4562 invoke-direct {v0, v4}, Lcom/android/server/NetworkTimeUpdateService;-><init>(Landroid/content/Context;)V
4564 - .catch Ljava/lang/Throwable; {:try_start_59e .. :try_end_5ac} :catch_9c1
4566 + .catch Ljava/lang/Throwable; {:try_start_5a3 .. :try_end_5b1} :catch_9c6
4568 move-object/from16 v88, v89
4574 const-string v3, "SystemServer"
4576 const-string v9, "CommonTimeManagementService"
4577 @@ -1723,22 +1762,22 @@
4578 move-object/from16 v0, v54
4580 invoke-direct {v0, v4}, Lcom/android/server/CommonTimeManagementService;-><init>(Landroid/content/Context;)V
4582 - .catch Ljava/lang/Throwable; {:try_start_5ae .. :try_end_5bc} :catch_9cd
4584 + .catch Ljava/lang/Throwable; {:try_start_5b3 .. :try_end_5c1} :catch_9d2
4588 const-string v3, "commontime_management"
4590 move-object/from16 v0, v54
4592 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4594 - .catch Ljava/lang/Throwable; {:try_start_5bc .. :try_end_5c3} :catch_a55
4596 + .catch Ljava/lang/Throwable; {:try_start_5c1 .. :try_end_5c8} :catch_a5a
4598 move-object/from16 v53, v54
4604 const-string v3, "SystemServer"
4606 const-string v9, "CertBlacklister"
4607 @@ -1748,10 +1787,10 @@
4608 new-instance v3, Lcom/android/server/CertBlacklister;
4610 invoke-direct {v3, v4}, Lcom/android/server/CertBlacklister;-><init>(Landroid/content/Context;)V
4612 - .catch Ljava/lang/Throwable; {:try_start_5c5 .. :try_end_5d1} :catch_9d9
4614 + .catch Ljava/lang/Throwable; {:try_start_5ca .. :try_end_5d6} :catch_9de
4618 invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
4620 move-result-object v3
4621 @@ -1762,9 +1801,9 @@
4625 - if-eqz v3, :cond_5f5
4626 + if-eqz v3, :cond_5fa
4630 const-string v3, "SystemServer"
4632 const-string v9, "Dreams Service"
4633 @@ -1776,23 +1815,23 @@
4634 move-object/from16 v0, v67
4636 invoke-direct {v0, v4}, Landroid/service/dreams/DreamManagerService;-><init>(Landroid/content/Context;)V
4638 - .catch Ljava/lang/Throwable; {:try_start_5de .. :try_end_5ec} :catch_9e5
4640 + .catch Ljava/lang/Throwable; {:try_start_5e3 .. :try_end_5f1} :catch_9ea
4644 const-string v3, "dreams"
4646 move-object/from16 v0, v67
4648 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4650 - .catch Ljava/lang/Throwable; {:try_start_5ec .. :try_end_5f3} :catch_a51
4652 + .catch Ljava/lang/Throwable; {:try_start_5f1 .. :try_end_5f8} :catch_a56
4654 move-object/from16 v66, v67
4662 const-string v3, "SystemServer"
4664 const-string v9, "AssetRedirectionManager Service"
4665 @@ -1806,10 +1845,10 @@
4666 invoke-direct {v9, v4}, Lcom/android/server/AssetRedirectionManagerService;-><init>(Landroid/content/Context;)V
4668 invoke-static {v3, v9}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4670 - .catch Ljava/lang/Throwable; {:try_start_5f5 .. :try_end_606} :catch_9f1
4672 + .catch Ljava/lang/Throwable; {:try_start_5fa .. :try_end_60b} :catch_9f6
4676 move-object/from16 v0, p0
4678 iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4679 @@ -1854,7 +1893,7 @@
4683 - if-eqz v29, :cond_9fd
4684 + if-eqz v29, :cond_a02
4686 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4688 @@ -1872,38 +1911,38 @@
4690 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->disableJitCompilation()V
4694 - invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
4696 - .catch Ljava/lang/Throwable; {:try_start_647 .. :try_end_64a} :catch_a06
4699 - if-eqz v62, :cond_64f
4703 - invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4704 + invoke-virtual/range {v117 .. v117}, Lcom/android/server/VibratorService;->systemReady()V
4706 - .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a12
4707 + .catch Ljava/lang/Throwable; {:try_start_64c .. :try_end_64f} :catch_a0b
4711 - if-eqz v90, :cond_654
4712 + if-eqz v62, :cond_654
4715 - invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
4716 + invoke-virtual/range {v62 .. v62}, Lcom/android/server/DevicePolicyManagerService;->systemReady()V
4718 - .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a1e
4719 + .catch Ljava/lang/Throwable; {:try_start_651 .. :try_end_654} :catch_a17
4724 + if-eqz v90, :cond_659
4727 + invoke-virtual/range {v90 .. v90}, Lcom/android/server/NotificationManagerService;->systemReady()V
4729 + .catch Ljava/lang/Throwable; {:try_start_656 .. :try_end_659} :catch_a23
4734 invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->systemReady()V
4736 - .catch Ljava/lang/Throwable; {:try_start_654 .. :try_end_657} :catch_a2a
4738 + .catch Ljava/lang/Throwable; {:try_start_659 .. :try_end_65c} :catch_a2f
4741 - if-eqz v29, :cond_660
4743 + if-eqz v29, :cond_665
4745 invoke-static {}, Lcom/android/server/am/ActivityManagerService;->self()Lcom/android/server/am/ActivityManagerService;
4747 @@ -1911,7 +1950,7 @@
4749 invoke-virtual {v3}, Lcom/android/server/am/ActivityManagerService;->showSafeModeOverlay()V
4753 invoke-virtual/range {v126 .. v126}, Lcom/android/server/wm/WindowManagerService;->computeNewConfiguration()Landroid/content/res/Configuration;
4755 move-result-object v55
4756 @@ -1948,18 +1987,18 @@
4758 invoke-virtual {v6}, Lcom/android/server/PowerManagerService;->systemReady()V
4762 invoke-interface/range {v93 .. v93}, Landroid/content/pm/IPackageManager;->systemReady()V
4764 - .catch Ljava/lang/Throwable; {:try_start_688 .. :try_end_68b} :catch_a36
4766 + .catch Ljava/lang/Throwable; {:try_start_68d .. :try_end_690} :catch_a3b
4772 invoke-virtual/range {v81 .. v81}, Lcom/android/internal/widget/LockSettingsService;->systemReady()V
4774 - .catch Ljava/lang/Throwable; {:try_start_68b .. :try_end_68e} :catch_a42
4776 + .catch Ljava/lang/Throwable; {:try_start_690 .. :try_end_693} :catch_a47
4780 new-instance v71, Landroid/content/IntentFilter;
4782 invoke-direct/range {v71 .. v71}, Landroid/content/IntentFilter;-><init>()V
4783 @@ -2072,7 +2111,7 @@
4787 - if-eqz v3, :cond_712
4788 + if-eqz v3, :cond_717
4790 const-string v3, "SystemServer"
4792 @@ -2080,7 +2119,7 @@
4794 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4798 invoke-static {}, Landroid/os/Looper;->loop()V
4800 const-string v3, "SystemServer"
4801 @@ -2091,25 +2130,25 @@
4819 invoke-static/range {v70 .. v70}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
4829 const-string v3, "1"
4831 move-object/from16 v0, v61
4832 @@ -2130,15 +2169,15 @@
4848 const-string v3, "SystemServer"
4850 const-string v9, "Failure starting Account Manager"
4851 @@ -2146,19 +2185,19 @@
4852 move-object/from16 v0, v68
4854 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4856 - .catch Ljava/lang/RuntimeException; {:try_start_72b .. :try_end_74d} :catch_74f
4858 + .catch Ljava/lang/RuntimeException; {:try_start_730 .. :try_end_752} :catch_754
4866 move-object/from16 v7, v44
4868 move-object/from16 v5, v47
4872 const-string v3, "System"
4874 const-string v9, "******************************************"
4875 @@ -2173,51 +2212,51 @@
4877 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
4910 - if-ne v0, v3, :cond_784
4911 + if-ne v0, v3, :cond_789
4915 const-string v3, "SystemServer"
4917 const-string v9, "No Bluetooth Service (factory test)"
4919 invoke-static {v3, v9}, Landroid/util/Slog;->i(Ljava/lang/String;Ljava/lang/String;)I
4928 move-object/from16 v117, v118
4930 move-object/from16 v77, v78
4937 const-string v3, "SystemServer"
4939 const-string v9, "Bluetooth Service"
4940 @@ -2229,10 +2268,10 @@
4941 move-object/from16 v0, v49
4943 invoke-direct {v0, v4}, Landroid/server/BluetoothService;-><init>(Landroid/content/Context;)V
4945 - .catch Ljava/lang/RuntimeException; {:try_start_775 .. :try_end_792} :catch_77e
4947 + .catch Ljava/lang/RuntimeException; {:try_start_77a .. :try_end_797} :catch_783
4951 const-string v3, "bluetooth"
4953 move-object/from16 v0, v49
4954 @@ -2253,7 +2292,7 @@
4958 - if-nez v3, :cond_7bf
4959 + if-nez v3, :cond_7c4
4961 new-instance v51, Landroid/server/BluetoothA2dpService;
4963 @@ -2262,10 +2301,10 @@
4964 move-object/from16 v1, v49
4966 invoke-direct {v0, v4, v1}, Landroid/server/BluetoothA2dpService;-><init>(Landroid/content/Context;Landroid/server/BluetoothService;)V
4968 - .catch Ljava/lang/RuntimeException; {:try_start_792 .. :try_end_7b3} :catch_aea
4970 + .catch Ljava/lang/RuntimeException; {:try_start_797 .. :try_end_7b8} :catch_aef
4974 const-string v3, "bluetooth_a2dp"
4976 move-object/from16 v0, v51
4977 @@ -2273,13 +2312,13 @@
4978 invoke-static {v3, v0}, Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V
4980 invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->initAfterA2dpRegistration()V
4982 - .catch Ljava/lang/RuntimeException; {:try_start_7b3 .. :try_end_7bd} :catch_af3
4984 + .catch Ljava/lang/RuntimeException; {:try_start_7b8 .. :try_end_7c2} :catch_af8
4986 move-object/from16 v50, v51
4992 move-object/from16 v0, p0
4994 iget-object v3, v0, Lcom/android/server/ServerThread;->mContentResolver:Landroid/content/ContentResolver;
4995 @@ -2292,21 +2331,21 @@
4999 - if-eqz v52, :cond_7cf
5000 + if-eqz v52, :cond_7d4
5002 invoke-virtual/range {v49 .. v49}, Landroid/server/BluetoothService;->enable()Z
5004 - .catch Ljava/lang/RuntimeException; {:try_start_7bf .. :try_end_7cf} :catch_aea
5006 + .catch Ljava/lang/RuntimeException; {:try_start_7c4 .. :try_end_7d4} :catch_aef
5010 move-object/from16 v48, v49
5021 const-string v3, "starting Input Manager Service"
5023 move-object/from16 v0, p0
5024 @@ -2315,9 +2354,9 @@
5026 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5035 const-string v3, "starting Accessibility Manager"
5036 @@ -2328,9 +2367,9 @@
5038 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5047 const-string v3, "making display ready"
5048 @@ -2341,9 +2380,9 @@
5050 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5059 const-string v3, "performing boot dexopt"
5060 @@ -2354,12 +2393,12 @@
5062 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5073 const-string v3, "starting Mount Service"
5075 move-object/from16 v0, p0
5076 @@ -2368,12 +2407,12 @@
5078 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5089 const-string v3, "starting LockSettingsService service"
5091 move-object/from16 v0, p0
5092 @@ -2382,12 +2421,12 @@
5094 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5105 const-string v3, "starting DevicePolicyService"
5107 move-object/from16 v0, p0
5108 @@ -2396,12 +2435,12 @@
5110 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5121 const-string v3, "starting StatusBarManagerService"
5123 move-object/from16 v0, p0
5124 @@ -2410,9 +2449,9 @@
5126 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5135 const-string v3, "starting Clipboard Service"
5136 @@ -2423,9 +2462,9 @@
5138 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5147 const-string v3, "starting NetworkManagement Service"
5148 @@ -2436,12 +2475,12 @@
5150 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5161 const-string v3, "starting Text Service Manager Service"
5163 move-object/from16 v0, p0
5164 @@ -2450,12 +2489,12 @@
5166 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5177 const-string v3, "starting NetworkStats Service"
5179 move-object/from16 v0, p0
5180 @@ -2464,14 +2503,14 @@
5182 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5191 move-object/from16 v8, v86
5195 const-string v3, "starting NetworkPolicy Service"
5197 move-object/from16 v0, p0
5198 @@ -2480,12 +2519,12 @@
5200 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5211 const-string v3, "starting Wi-Fi P2pService"
5213 move-object/from16 v0, p0
5214 @@ -2494,12 +2533,12 @@
5216 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5227 const-string v3, "starting Wi-Fi Service"
5229 move-object/from16 v0, p0
5230 @@ -2508,12 +2547,12 @@
5232 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5243 const-string v3, "starting Connectivity Service"
5245 move-object/from16 v0, p0
5246 @@ -2522,9 +2561,9 @@
5248 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5257 const-string v3, "starting Service Discovery Service"
5258 @@ -2535,12 +2574,12 @@
5260 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5271 const-string v3, "starting ThrottleService"
5273 move-object/from16 v0, p0
5274 @@ -2549,9 +2588,9 @@
5276 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5285 const-string v3, "starting UpdateLockService"
5286 @@ -2562,12 +2601,12 @@
5288 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5299 const-string v3, "SystemServer"
5301 const-string v9, "Failure starting Profile Manager"
5302 @@ -2576,9 +2615,9 @@
5304 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5313 const-string v3, "making Account Manager Service ready"
5314 @@ -2589,9 +2628,9 @@
5316 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5325 const-string v3, "making Content Service ready"
5326 @@ -2602,12 +2641,12 @@
5328 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5339 const-string v3, "starting Notification Manager"
5341 move-object/from16 v0, p0
5342 @@ -2616,9 +2655,9 @@
5344 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5353 const-string v3, "starting DeviceStorageMonitor service"
5354 @@ -2629,12 +2668,12 @@
5356 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5367 const-string v3, "starting Location Manager"
5369 move-object/from16 v0, p0
5370 @@ -2643,12 +2682,12 @@
5372 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5383 const-string v3, "starting Country Detector"
5385 move-object/from16 v0, p0
5386 @@ -2657,9 +2696,9 @@
5388 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5397 const-string v3, "starting Search Service"
5398 @@ -2670,9 +2709,9 @@
5400 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5409 const-string v3, "starting DropBoxManagerService"
5410 @@ -2683,12 +2722,12 @@
5412 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5423 const-string v3, "starting Wallpaper Service"
5425 move-object/from16 v0, p0
5426 @@ -2697,9 +2736,9 @@
5428 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5437 const-string v3, "starting Audio Service"
5438 @@ -2710,9 +2749,9 @@
5440 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5449 const-string v3, "starting DockObserver"
5450 @@ -2723,9 +2762,9 @@
5452 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5461 const-string v3, "starting RotationSwitchObserver"
5462 @@ -2736,9 +2775,9 @@
5464 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5473 const-string v3, "starting WiredAccessoryObserver"
5474 @@ -2749,12 +2788,12 @@
5476 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5487 const-string v3, "starting UsbService"
5489 move-object/from16 v0, p0
5490 @@ -2763,12 +2802,12 @@
5492 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5503 const-string v3, "SystemServer"
5505 const-string v9, "Failure starting SerialService"
5506 @@ -2777,9 +2816,9 @@
5508 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5517 const-string v3, "starting UiModeManagerService"
5518 @@ -2790,9 +2829,9 @@
5520 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5529 const-string v3, "SystemServer"
5530 @@ -2803,12 +2842,12 @@
5532 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5543 const-string v3, "starting AppWidget Service"
5545 move-object/from16 v0, p0
5546 @@ -2817,9 +2856,9 @@
5548 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5557 const-string v3, "starting Recognition Service"
5558 @@ -2830,9 +2869,9 @@
5560 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5569 const-string v3, "starting DiskStats Service"
5570 @@ -2843,9 +2882,9 @@
5572 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5581 const-string v3, "starting SamplingProfiler Service"
5582 @@ -2856,9 +2895,9 @@
5584 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5593 const-string v3, "starting NetworkTimeUpdate service"
5594 @@ -2869,12 +2908,12 @@
5596 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5607 const-string v3, "starting CommonTimeManagementService service"
5609 move-object/from16 v0, p0
5610 @@ -2883,9 +2922,9 @@
5612 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5621 const-string v3, "starting CertBlacklister"
5622 @@ -2896,12 +2935,12 @@
5624 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5635 const-string v3, "starting DreamManagerService"
5637 move-object/from16 v0, p0
5638 @@ -2910,9 +2949,9 @@
5640 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5649 const-string v3, "SystemServer"
5650 @@ -2923,18 +2962,18 @@
5652 invoke-static {v3, v9, v0}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
5659 invoke-static {}, Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime;
5661 move-result-object v3
5663 invoke-virtual {v3}, Ldalvik/system/VMRuntime;->startJitCompilation()V
5672 const-string v3, "making Vibrator Service ready"
5673 @@ -2945,9 +2984,9 @@
5675 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5684 const-string v3, "making Device Policy Service ready"
5685 @@ -2958,9 +2997,9 @@
5687 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5696 const-string v3, "making Notification Service ready"
5697 @@ -2971,9 +3010,9 @@
5699 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5708 const-string v3, "making Window Manager Service ready"
5709 @@ -2984,9 +3023,9 @@
5711 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5720 const-string v3, "making Package Manager Service ready"
5721 @@ -2997,9 +3036,9 @@
5723 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5732 const-string v3, "making Lock Settings Service ready"
5733 @@ -3010,171 +3049,171 @@
5735 invoke-virtual {v0, v3, v1}, Lcom/android/server/ServerThread;->reportWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
5750 move-object/from16 v66, v67
5759 move-object/from16 v53, v54
5768 move-object/from16 v45, v46
5777 move-object/from16 v103, v104
5786 move-object/from16 v115, v116
5795 move-object/from16 v120, v121
5804 move-object/from16 v59, v60
5813 move-object/from16 v79, v80
5822 move-object/from16 v90, v91
5831 move-object/from16 v95, v96
5840 move-object/from16 v109, v110
5849 move-object/from16 v56, v57
5858 move-object/from16 v122, v123
5867 move-object/from16 v124, v125
5883 move-object/from16 v12, v87
5892 move-object/from16 v111, v112
5901 move-object/from16 v107, v108
5910 move-object/from16 v62, v63
5919 move-object/from16 v81, v82
5928 move-object/from16 v84, v85
5944 move-object/from16 v74, v75
5953 move-object/from16 v7, v44
5954 @@ -3183,9 +3222,9 @@
5956 move-object/from16 v6, v94
5965 move-object/from16 v7, v44
5966 @@ -3194,9 +3233,9 @@
5968 move-object/from16 v42, v43
5977 move-object/from16 v7, v44
5978 @@ -3205,18 +3244,18 @@
5980 move-object/from16 v77, v78
5989 move-object/from16 v7, v44
5991 move-object/from16 v77, v78
6000 move-object/from16 v7, v44
6001 @@ -3225,9 +3264,9 @@
6003 move-object/from16 v77, v78
6012 move-object/from16 v48, v49
6013 @@ -3236,9 +3275,9 @@
6015 move-object/from16 v77, v78
6024 move-object/from16 v50, v51
6025 @@ -3249,17 +3288,17 @@
6027 move-object/from16 v77, v78
6036 move-object/from16 v42, v43
6043 move-object/from16 v8, v86
6048 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$1.smali ext-services/smali/com/android/server/TelephonyRegistry$1.smali
6049 --- stock-services/smali/com/android/server/TelephonyRegistry$1.smali 2012-10-12 12:27:13.837330595 -0500
6050 +++ ext-services/smali/com/android/server/TelephonyRegistry$1.smali 1969-12-31 18:00:00.000000000 -0600
6052 -.class synthetic Lcom/android/server/TelephonyRegistry$1;
6053 -.super Ljava/lang/Object;
6054 -.source "TelephonyRegistry.java"
6058 -.annotation system Ldalvik/annotation/EnclosingClass;
6059 - value = Lcom/android/server/TelephonyRegistry;
6062 -.annotation system Ldalvik/annotation/InnerClass;
6063 - accessFlags = 0x1008
6066 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry$Record.smali ext-services/smali/com/android/server/TelephonyRegistry$Record.smali
6067 --- stock-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-10-12 12:27:13.837330595 -0500
6068 +++ ext-services/smali/com/android/server/TelephonyRegistry$Record.smali 2012-10-12 14:19:32.118743926 -0500
6070 -.class Lcom/android/server/TelephonyRegistry$Record;
6071 +.class public Lcom/android/server/TelephonyRegistry$Record;
6072 .super Ljava/lang/Object;
6073 .source "TelephonyRegistry.java"
6078 .annotation system Ldalvik/annotation/InnerClass;
6088 -.method private constructor <init>()V
6089 +.method public constructor <init>()V
6092 invoke-direct {p0}, Ljava/lang/Object;-><init>()V
6097 -.method synthetic constructor <init>(Lcom/android/server/TelephonyRegistry$1;)V
6100 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6104 diff -Npru stock-services/smali/com/android/server/TelephonyRegistry.smali ext-services/smali/com/android/server/TelephonyRegistry.smali
6105 --- stock-services/smali/com/android/server/TelephonyRegistry.smali 2012-10-12 12:27:13.861330714 -0500
6106 +++ ext-services/smali/com/android/server/TelephonyRegistry.smali 2012-10-12 14:19:32.054743609 -0500
6109 .annotation system Ldalvik/annotation/MemberClasses;
6111 - Lcom/android/server/TelephonyRegistry$1;,
6112 Lcom/android/server/TelephonyRegistry$Record;
6117 .field private final mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6119 -.field private mCallForwarding:Z
6120 +.field protected mCallForwarding:Z
6122 -.field private mCallIncomingNumber:Ljava/lang/String;
6123 +.field protected mCallIncomingNumber:Ljava/lang/String;
6125 -.field private mCallState:I
6126 +.field protected mCallState:I
6128 -.field private mCellInfo:Landroid/telephony/CellInfo;
6129 +.field protected mCellInfo:Landroid/telephony/CellInfo;
6131 -.field private mCellLocation:Landroid/os/Bundle;
6132 +.field protected mCellLocation:Landroid/os/Bundle;
6134 .field private mConnectedApns:Ljava/util/ArrayList;
6135 .annotation system Ldalvik/annotation/Signature;
6140 -.field private final mContext:Landroid/content/Context;
6141 +.field protected final mContext:Landroid/content/Context;
6143 -.field private mDataActivity:I
6144 +.field protected mDataActivity:I
6146 .field private mDataConnectionApn:Ljava/lang/String;
6150 .field private mDataConnectionLinkProperties:Landroid/net/LinkProperties;
6152 -.field private mDataConnectionNetworkType:I
6153 +.field protected mDataConnectionNetworkType:I
6155 .field private mDataConnectionPossible:Z
6157 .field private mDataConnectionReason:Ljava/lang/String;
6159 -.field private mDataConnectionState:I
6160 +.field protected mDataConnectionState:I
6162 -.field private mMessageWaiting:Z
6163 +.field protected mMessageWaiting:Z
6165 -.field private mOtaspMode:I
6166 +.field protected mOtaspMode:I
6168 -.field private final mRecords:Ljava/util/ArrayList;
6169 +.field protected final mRecords:Ljava/util/ArrayList;
6170 .annotation system Ldalvik/annotation/Signature;
6172 "Ljava/util/ArrayList",
6177 -.field private final mRemoveList:Ljava/util/ArrayList;
6178 +.field protected final mRemoveList:Ljava/util/ArrayList;
6179 .annotation system Ldalvik/annotation/Signature;
6181 "Ljava/util/ArrayList",
6186 -.field private mServiceState:Landroid/telephony/ServiceState;
6187 +.field protected mServiceState:Landroid/telephony/ServiceState;
6189 -.field private mSignalStrength:Landroid/telephony/SignalStrength;
6190 +.field protected mSignalStrength:Landroid/telephony/SignalStrength;
6194 -.method constructor <init>(Landroid/content/Context;)V
6195 +.method protected constructor <init>(Landroid/content/Context;)V
6203 -.method private broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6205 +.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6208 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6210 @@ -391,29 +390,29 @@
6212 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6214 - invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6218 - invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6220 - .catchall {:try_start_4 .. :try_end_d} :catchall_28
6221 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6222 + invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6224 + .catchall {:try_start_4 .. :try_end_9} :catchall_29
6225 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6229 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6231 new-instance v3, Landroid/content/Intent;
6233 - const-string v4, "android.intent.action.SERVICE_STATE"
6234 + const-string v4, "android.intent.action.SIG_STR"
6236 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6238 + const/high16 v4, 0x2000
6240 + invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6242 new-instance v0, Landroid/os/Bundle;
6244 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6246 - invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6247 + invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6249 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6251 @@ -423,21 +422,23 @@
6259 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6271 -.method private broadcastSignalStrengthChanged(Landroid/telephony/SignalStrength;)V
6275 +.method protected broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
6278 invoke-static {}, Landroid/os/Binder;->clearCallingIdentity()J
6280 @@ -446,29 +447,29 @@
6282 iget-object v4, p0, Lcom/android/server/TelephonyRegistry;->mBatteryStats:Lcom/android/internal/app/IBatteryStats;
6284 - invoke-interface {v4, p1}, Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V
6286 - .catchall {:try_start_4 .. :try_end_9} :catchall_29
6287 - .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_9} :catch_2e
6288 + invoke-virtual {p1}, Landroid/telephony/ServiceState;->getState()I
6293 + invoke-interface {v4, v5}, Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V
6295 + .catchall {:try_start_4 .. :try_end_d} :catchall_28
6296 + .catch Landroid/os/RemoteException; {:try_start_4 .. :try_end_d} :catch_2d
6299 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6301 new-instance v3, Landroid/content/Intent;
6303 - const-string v4, "android.intent.action.SIG_STR"
6304 + const-string v4, "android.intent.action.SERVICE_STATE"
6306 invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
6308 - const/high16 v4, 0x2000
6310 - invoke-virtual {v3, v4}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
6312 new-instance v0, Landroid/os/Bundle;
6314 invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
6316 - invoke-virtual {p1, v0}, Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V
6317 + invoke-virtual {p1, v0}, Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
6319 invoke-virtual {v3, v0}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
6321 @@ -478,20 +479,20 @@
6329 invoke-static {v1, v2}, Landroid/os/Binder;->restoreCallingIdentity(J)V
6341 -.method private checkListenerPermission(I)V
6342 +.method protected checkListenerPermission(I)V
6350 -.method private checkNotifyPermission(Ljava/lang/String;)Z
6351 +.method protected checkNotifyPermission(Ljava/lang/String;)Z
6354 iget-object v1, p0, Lcom/android/server/TelephonyRegistry;->mContext:Landroid/content/Context;
6355 @@ -602,111 +603,6 @@
6359 -.method private handleRemoveListLocked()V
6362 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6364 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6368 - if-lez v2, :cond_23
6370 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6372 - invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6374 - move-result-object v1
6377 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6381 - if-eqz v2, :cond_1e
6383 - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6385 - move-result-object v0
6387 - check-cast v0, Landroid/os/IBinder;
6389 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6394 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6396 - invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6402 -.method private remove(Landroid/os/IBinder;)V
6405 - iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6410 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6412 - invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6419 - if-ge v0, v1, :cond_22
6421 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6423 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
6425 - move-result-object v2
6427 - check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
6429 - iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6431 - if-ne v2, p1, :cond_1f
6433 - iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6435 - invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
6443 - add-int/lit8 v0, v0, 0x1
6457 - .catchall {:try_start_3 .. :try_end_26} :catchall_24
6464 .method public dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V
6467 @@ -1204,12 +1100,55 @@
6471 +.method protected handleRemoveListLocked()V
6474 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6476 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
6480 + if-lez v2, :cond_23
6482 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6484 + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
6486 + move-result-object v1
6489 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
6493 + if-eqz v2, :cond_1e
6495 + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
6497 + move-result-object v0
6499 + check-cast v0, Landroid/os/IBinder;
6501 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6506 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
6508 + invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
6514 .method public listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V
6517 - if-eqz p3, :cond_133
6518 + if-eqz p3, :cond_131
6520 - invoke-direct {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6521 + invoke-virtual {p0, p3}, Lcom/android/server/TelephonyRegistry;->checkListenerPermission(I)V
6523 iget-object v9, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
6525 @@ -1226,7 +1165,7 @@
6527 invoke-virtual {v8}, Ljava/util/ArrayList;->size()I
6529 - .catchall {:try_start_9 .. :try_end_12} :catchall_db
6530 + .catchall {:try_start_9 .. :try_end_12} :catchall_da
6534 @@ -1246,7 +1185,7 @@
6536 check-cast v5, Lcom/android/server/TelephonyRegistry$Record;
6538 - .catchall {:try_start_17 .. :try_end_1f} :catchall_13b
6539 + .catchall {:try_start_17 .. :try_end_1f} :catchall_139
6542 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6543 @@ -1262,7 +1201,7 @@
6545 iput p3, v5, Lcom/android/server/TelephonyRegistry$Record;->events:I
6547 - .catchall {:try_start_1f .. :try_end_2a} :catchall_db
6548 + .catchall {:try_start_1f .. :try_end_2a} :catchall_da
6552 @@ -1281,8 +1220,8 @@
6554 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
6556 - .catchall {:try_start_30 .. :try_end_3c} :catchall_db
6557 - .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_de
6558 + .catchall {:try_start_30 .. :try_end_3c} :catchall_da
6559 + .catch Landroid/os/RemoteException; {:try_start_30 .. :try_end_3c} :catch_dd
6563 @@ -1308,8 +1247,8 @@
6565 invoke-interface {v8, v3}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V
6567 - .catchall {:try_start_40 .. :try_end_50} :catchall_db
6568 - .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e6
6569 + .catchall {:try_start_40 .. :try_end_50} :catchall_da
6570 + .catch Landroid/os/RemoteException; {:try_start_40 .. :try_end_50} :catch_e5
6574 @@ -1324,8 +1263,8 @@
6576 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V
6578 - .catchall {:try_start_54 .. :try_end_5b} :catchall_db
6579 - .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ee
6580 + .catchall {:try_start_54 .. :try_end_5b} :catchall_da
6581 + .catch Landroid/os/RemoteException; {:try_start_54 .. :try_end_5b} :catch_ed
6585 @@ -1340,8 +1279,8 @@
6587 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V
6589 - .catchall {:try_start_5f .. :try_end_66} :catchall_db
6590 - .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f6
6591 + .catchall {:try_start_5f .. :try_end_66} :catchall_da
6592 + .catch Landroid/os/RemoteException; {:try_start_5f .. :try_end_66} :catch_f5
6596 @@ -1360,8 +1299,8 @@
6598 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V
6600 - .catchall {:try_start_6a .. :try_end_76} :catchall_db
6601 - .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fe
6602 + .catchall {:try_start_6a .. :try_end_76} :catchall_da
6603 + .catch Landroid/os/RemoteException; {:try_start_6a .. :try_end_76} :catch_fd
6607 @@ -1378,8 +1317,8 @@
6609 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V
6611 - .catchall {:try_start_7a .. :try_end_83} :catchall_db
6612 - .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_106
6613 + .catchall {:try_start_7a .. :try_end_83} :catchall_da
6614 + .catch Landroid/os/RemoteException; {:try_start_7a .. :try_end_83} :catch_105
6618 @@ -1396,8 +1335,8 @@
6620 invoke-interface {v8, v10, v11}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V
6622 - .catchall {:try_start_87 .. :try_end_90} :catchall_db
6623 - .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10e
6624 + .catchall {:try_start_87 .. :try_end_90} :catchall_da
6625 + .catch Landroid/os/RemoteException; {:try_start_87 .. :try_end_90} :catch_10d
6629 @@ -1412,8 +1351,8 @@
6631 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V
6633 - .catchall {:try_start_94 .. :try_end_9b} :catchall_db
6634 - .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_116
6635 + .catchall {:try_start_94 .. :try_end_9b} :catchall_da
6636 + .catch Landroid/os/RemoteException; {:try_start_94 .. :try_end_9b} :catch_115
6640 @@ -1428,8 +1367,8 @@
6642 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V
6644 - .catchall {:try_start_9f .. :try_end_a6} :catchall_db
6645 - .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11e
6646 + .catchall {:try_start_9f .. :try_end_a6} :catchall_da
6647 + .catch Landroid/os/RemoteException; {:try_start_9f .. :try_end_a6} :catch_11c
6651 @@ -1444,8 +1383,8 @@
6653 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onOtaspChanged(I)V
6655 - .catchall {:try_start_aa .. :try_end_b1} :catchall_db
6656 - .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_125
6657 + .catchall {:try_start_aa .. :try_end_b1} :catchall_da
6658 + .catch Landroid/os/RemoteException; {:try_start_aa .. :try_end_b1} :catch_123
6662 @@ -1464,15 +1403,15 @@
6664 invoke-interface {v8, v10}, Lcom/android/internal/telephony/IPhoneStateListener;->onCellInfoChanged(Landroid/telephony/CellInfo;)V
6666 - .catchall {:try_start_b5 .. :try_end_c1} :catchall_db
6667 - .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12c
6668 + .catchall {:try_start_b5 .. :try_end_c1} :catchall_da
6669 + .catch Landroid/os/RemoteException; {:try_start_b5 .. :try_end_c1} :catch_12a
6676 - .catchall {:try_start_c1 .. :try_end_c2} :catchall_db
6677 + .catchall {:try_start_c1 .. :try_end_c2} :catchall_da
6681 @@ -1488,13 +1427,11 @@
6683 new-instance v5, Lcom/android/server/TelephonyRegistry$Record;
6687 - invoke-direct {v5, v8}, Lcom/android/server/TelephonyRegistry$Record;-><init>(Lcom/android/server/TelephonyRegistry$1;)V
6689 - .catchall {:try_start_c8 .. :try_end_ce} :catchall_13b
6690 + invoke-direct {v5}, Lcom/android/server/TelephonyRegistry$Record;-><init>()V
6692 + .catchall {:try_start_c8 .. :try_end_cd} :catchall_139
6696 iput-object v1, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6698 iput-object p2, v5, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
6699 @@ -1507,133 +1444,133 @@
6711 - .catchall {:try_start_ce .. :try_end_dd} :catchall_db
6713 + .catchall {:try_start_cd .. :try_end_dc} :catchall_da
6723 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6725 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6726 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6734 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6736 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6737 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6745 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6747 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6748 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6756 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
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
6767 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6769 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6770 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6778 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6780 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6781 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6789 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6791 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6792 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6800 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6802 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6803 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6812 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6814 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6815 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6823 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6825 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6826 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6834 iget-object v8, v5, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
6836 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6838 - .catchall {:try_start_df .. :try_end_132} :catchall_db
6839 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6841 + .catchall {:try_start_de .. :try_end_130} :catchall_da
6847 invoke-interface {p2}, Lcom/android/internal/telephony/IPhoneStateListener;->asBinder()Landroid/os/IBinder;
6849 move-result-object v8
6851 - invoke-direct {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6852 + invoke-virtual {p0, v8}, Lcom/android/server/TelephonyRegistry;->remove(Landroid/os/IBinder;)V
6866 .method public notifyCallForwardingChanged(Z)V
6867 @@ -1641,7 +1578,7 @@
6869 const-string v3, "notifyCallForwardingChanged()"
6871 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6872 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6876 @@ -1719,7 +1656,7 @@
6880 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6881 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6885 @@ -1733,7 +1670,7 @@
6887 const-string v3, "notifyCallState()"
6889 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6890 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6894 @@ -1813,7 +1750,7 @@
6898 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6899 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6903 @@ -1829,7 +1766,7 @@
6905 const-string v3, "notifyCellInfo()"
6907 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6908 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6912 @@ -1911,7 +1848,7 @@
6916 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6917 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6921 @@ -1925,7 +1862,7 @@
6923 const-string v3, "notifyCellLocation()"
6925 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6926 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6930 @@ -2007,7 +1944,7 @@
6934 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6935 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6939 @@ -2021,7 +1958,7 @@
6941 const-string v3, "notifyDataActivity()"
6943 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6944 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6948 @@ -2099,7 +2036,7 @@
6952 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6953 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6957 @@ -2113,7 +2050,7 @@
6959 const-string v1, "notifyDataConnection()"
6961 - invoke-direct {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6962 + invoke-virtual {p0, v1}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6966 @@ -2281,7 +2218,7 @@
6970 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6971 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6975 @@ -2316,7 +2253,7 @@
6977 const-string v0, "notifyDataConnectionFailed()"
6979 - invoke-direct {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6980 + invoke-virtual {p0, v0}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6984 @@ -2336,7 +2273,7 @@
6986 const-string v3, "notifyMessageWaitingChanged()"
6988 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6989 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
6993 @@ -2414,7 +2351,7 @@
6997 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
6998 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7002 @@ -2428,7 +2365,7 @@
7004 const-string v3, "notifyOtaspChanged()"
7006 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7007 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7011 @@ -2506,7 +2443,7 @@
7015 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7016 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7020 @@ -2516,11 +2453,11 @@
7023 .method public notifyServiceState(Landroid/telephony/ServiceState;)V
7027 const-string v3, "notifyServiceState()"
7029 - invoke-direct {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7030 + invoke-virtual {p0, v3}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7034 @@ -2537,19 +2474,29 @@
7036 iput-object p1, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7038 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mServiceState:Landroid/telephony/ServiceState;
7040 + const-string v5, ""
7042 + const-string v6, ""
7044 + const-string v7, ""
7046 + invoke-virtual {v3, v5, v6, v7}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7048 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7050 invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
7052 move-result-object v1
7058 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
7062 - if-eqz v3, :cond_3d
7063 + if-eqz v3, :cond_51
7065 invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
7067 @@ -2558,14 +2505,22 @@
7068 check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7070 iget v3, v2, Lcom/android/server/TelephonyRegistry$Record;->events:I
7072 - .catchall {:try_start_c .. :try_end_22} :catchall_3a
7074 + .catchall {:try_start_c .. :try_end_2d} :catchall_4e
7076 and-int/lit8 v3, v3, 0x1
7078 - if-eqz v3, :cond_14
7079 + if-eqz v3, :cond_1f
7082 + const-string v3, ""
7084 + const-string v5, ""
7086 + const-string v6, ""
7088 + invoke-virtual {p1, v3, v5, v6}, Landroid/telephony/ServiceState;->setOperatorName(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
7091 iget-object v3, v2, Lcom/android/server/TelephonyRegistry$Record;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
7093 new-instance v5, Landroid/telephony/ServiceState;
7094 @@ -2573,42 +2528,42 @@
7095 invoke-direct {v5, p1}, Landroid/telephony/ServiceState;-><init>(Landroid/telephony/ServiceState;)V
7097 invoke-interface {v3, v5}, Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V
7099 - .catchall {:try_start_26 .. :try_end_30} :catchall_3a
7100 - .catch Landroid/os/RemoteException; {:try_start_26 .. :try_end_30} :catch_31
7102 + .catchall {:try_start_31 .. :try_end_44} :catchall_4e
7103 + .catch Landroid/os/RemoteException; {:try_start_31 .. :try_end_44} :catch_45
7114 iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRemoveList:Ljava/util/ArrayList;
7116 iget-object v5, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7118 invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
7129 - .catchall {:try_start_32 .. :try_end_3c} :catchall_3a
7131 + .catchall {:try_start_46 .. :try_end_50} :catchall_4e
7137 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7140 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7144 - .catchall {:try_start_3d .. :try_end_41} :catchall_3a
7146 + .catchall {:try_start_51 .. :try_end_55} :catchall_4e
7148 - invoke-direct {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7149 + invoke-virtual {p0, p1}, Lcom/android/server/TelephonyRegistry;->broadcastServiceStateChanged(Landroid/telephony/ServiceState;)V
7153 @@ -2618,7 +2573,7 @@
7155 const-string v4, "notifySignalStrength()"
7157 - invoke-direct {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7158 + invoke-virtual {p0, v4}, Lcom/android/server/TelephonyRegistry;->checkNotifyPermission(Ljava/lang/String;)Z
7162 @@ -2741,7 +2696,7 @@
7166 - invoke-direct {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7167 + invoke-virtual {p0}, Lcom/android/server/TelephonyRegistry;->handleRemoveListLocked()V
7171 @@ -2751,3 +2706,63 @@
7176 +.method protected remove(Landroid/os/IBinder;)V
7179 + iget-object v3, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7184 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7186 + invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
7193 + if-ge v0, v1, :cond_22
7195 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7197 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
7199 + move-result-object v2
7201 + check-cast v2, Lcom/android/server/TelephonyRegistry$Record;
7203 + iget-object v2, v2, Lcom/android/server/TelephonyRegistry$Record;->binder:Landroid/os/IBinder;
7205 + if-ne v2, p1, :cond_1f
7207 + iget-object v2, p0, Lcom/android/server/TelephonyRegistry;->mRecords:Ljava/util/ArrayList;
7209 + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object;
7217 + add-int/lit8 v0, v0, 0x1
7231 + .catchall {:try_start_3 .. :try_end_26} :catchall_24