commit d7d8661ef46a333dce1d3096a391af9f2db82111
author Hall Liu <hallliu@google.com> Tue Feb 06 18:13:26 2018 +0000
committer Baligh Uddin <baligh@google.com> Tue Feb 06 14:50:10 2018 -0800
tree f14bd45d231c66fc265d0d9508c752053f69f2a9
parent b19bd77586a001489f71f46652b4c21b9452ddc0

Revert "Update method calls to avoid security errors"

This reverts commit a984c97ee6533a84a2d9f2951f42ba0ec78bc77f.

Reason for revert: b/72967560

Change-Id: Ie7c160dd63cf952e272022bf5f7670940ba3e83b

src/java/com/android/internal/telephony/PhoneSwitcher.java

diff --git a/src/java/com/android/internal/telephony/PhoneSwitcher.java b/src/java/com/android/internal/telephony/PhoneSwitcher.java
index cd28b2b..1c6e023 100644
--- a/src/java/com/android/internal/telephony/PhoneSwitcher.java
+++ b/src/java/com/android/internal/telephony/PhoneSwitcher.java
@@ -124,8 +124,7 @@
         mCommandsInterfaces = cis;
 
         try {
-            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),
-                    mSubscriptionsChangedListener);
+            tr.addOnSubscriptionsChangedListener("PhoneSwitcher", mSubscriptionsChangedListener);
         } catch (RemoteException e) {
         }
 

src/java/com/android/internal/telephony/SubscriptionMonitor.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionMonitor.java b/src/java/com/android/internal/telephony/SubscriptionMonitor.java
index 8ccec6f..4307875 100644
--- a/src/java/com/android/internal/telephony/SubscriptionMonitor.java
+++ b/src/java/com/android/internal/telephony/SubscriptionMonitor.java
@@ -70,7 +70,7 @@
     public SubscriptionMonitor(ITelephonyRegistry tr, Context context,
             SubscriptionController subscriptionController, int numPhones) {
         try {
-            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),
+            tr.addOnSubscriptionsChangedListener("SubscriptionMonitor",
                     mSubscriptionsChangedListener);
         } catch (RemoteException e) {
         }