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

Commit 0af5e133 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Update method calls to avoid security errors" am: dbf3f7a5 am: 4bf88a6a 

am: e2d9b291

Change-Id: I775f52676d27797f7bd12c6e88d12474738fa8eb
parents e9fa2bce e2d9b291

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

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



        try {

            tr.addOnSubscriptionsChangedListener("PhoneSwitcher", mSubscriptionsChangedListener);

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    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("SubscriptionMonitor",

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        }