Merge "Add permission check and clear callers identity for setUiccApplicationsEnabled." (c3c13de4) · Commits · e / os / android_frameworks_opt_telephony

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

+19 −12

Original line number	Diff line number	Diff line
		@@ -1939,6 +1939,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);

		@@ -1956,6 +1960,9 @@ public class SubscriptionController extends ISub.Stub {
		}

		return result;
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		/**