Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c00077f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Revert "Update method calls to avoid security errors"" am: 96364167 am: 69f6354d 

am: 71a8d845

Change-Id: Ia28c631a7a4077fcb324cd165f56f4efe4d871c9
parents 723c6004 71a8d845

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

+1 −2
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ public class PhoneSwitcher extends Handler { 
        mCommandsInterfaces = cis;



        try {

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

            tr.addOnSubscriptionsChangedListener("PhoneSwitcher", mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class SubscriptionMonitor { 
    public SubscriptionMonitor(ITelephonyRegistry tr, Context context,

            SubscriptionController subscriptionController, int numPhones) {

        try {

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

            tr.addOnSubscriptionsChangedListener("SubscriptionMonitor",

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        }