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

Commit 88d88215 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Update method calls to avoid security errors" 

am: 5e62a7b5

Change-Id: I65756830135cc94c75a2d0024230e83d102ef5a3
parents 49a63113 5e62a7b5

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

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

        mCommandsInterfaces = cis;





        try {

        try {

            tr.addOnSubscriptionsChangedListener("PhoneSwitcher", mSubscriptionsChangedListener);

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

        }

        }

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

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

    public SubscriptionMonitor(ITelephonyRegistry tr, Context context,

            SubscriptionController subscriptionController, int numPhones) {

            SubscriptionController subscriptionController, int numPhones) {

        try {

        try {

            tr.addOnSubscriptionsChangedListener("SubscriptionMonitor",

            tr.addOnSubscriptionsChangedListener(context.getOpPackageName(),

                    mSubscriptionsChangedListener);

                    mSubscriptionsChangedListener);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

        }

        }