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

Commit d2aea0a9 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Add permission check and clear callers identity for... 

Merge "Add permission check and clear callers identity for setUiccApplicationsEnabled." into rvc-dev am: d84d3e0c

Change-Id: I6fb5322f57ac325f76739f6efebb67e1b1d950b1
parents 6f0392ae d84d3e0c

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

+19 −12
Original line number Diff line number Diff line
@@ -2107,6 +2107,10 @@ public class SubscriptionController extends ISub.Stub { 
    public int setUiccApplicationsEnabled(boolean enabled, int subId) {

        if (DBG) logd("[setUiccApplicationsEnabled]+ enabled:" + enabled + " subId:" + subId);



        enforceModifyPhoneState("setUiccApplicationsEnabled");



        long identity = Binder.clearCallingIdentity();

        try {

            ContentValues value = new ContentValues(1);

            value.put(SubscriptionManager.UICC_APPLICATIONS_ENABLED, enabled);
@@ -2124,6 +2128,9 @@ public class SubscriptionController extends ISub.Stub { 
            }



            return result;

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    /**