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

Commit ce077604 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Notify SubscriptionInfo change when setOpportunistic or setMetered" am: 272177f9 

am: 6468c41a

Change-Id: I2e116900a01e5b5cac135ce8177cfc40f819d9de
parents 15b888d1 6468c41a

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

+10 −2
Original line number Diff line number Diff line
@@ -2349,8 +2349,12 @@ public class SubscriptionController extends ISub.Stub { 


        long token = Binder.clearCallingIdentity();

        try {

            return setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,

            int ret = setSubscriptionProperty(subId, SubscriptionManager.IS_OPPORTUNISTIC,

                    String.valueOf(opportunistic ? 1 : 0));



            if (ret != 0) notifySubscriptionInfoChanged();



            return ret;

        } finally {

            Binder.restoreCallingIdentity(token);

        }
@@ -2380,8 +2384,12 @@ public class SubscriptionController extends ISub.Stub { 


        long token = Binder.clearCallingIdentity();

        try {

            return setSubscriptionProperty(subId, SubscriptionManager.IS_METERED,

            int ret = setSubscriptionProperty(subId, SubscriptionManager.IS_METERED,

                    String.valueOf(isMetered ? 1 : 0));



            if (ret != 0) notifySubscriptionInfoChanged();



            return ret;

        } finally {

            Binder.restoreCallingIdentity(token);

        }