Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." (cd2bdd1e) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -13283,7 +13283,7 @@ package android.telephony {
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);
		method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);
		method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public android.os.UserHandle getUserHandle(int);
		method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public android.os.UserHandle getSubscriptionUserHandle(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);
		method public void requestEmbeddedSubscriptionInfoListRefresh();
		method public void requestEmbeddedSubscriptionInfoListRefresh(int);
		@@ -13293,8 +13293,8 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultVoiceSubscriptionId(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public void setSubscriptionUserHandle(int, @Nullable android.os.UserHandle);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION) public void setUserHandle(int, @Nullable android.os.UserHandle);
		field @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_PLANS) public static final String ACTION_SUBSCRIPTION_PLANS_CHANGED = "android.telephony.action.SUBSCRIPTION_PLANS_CHANGED";
		field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
		field @NonNull public static final android.net.Uri CROSS_SIM_ENABLED_CONTENT_URI;

telephony/java/android/telephony/SubscriptionManager.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -4155,18 +4155,18 @@ public class SubscriptionManager {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION)
		public void setUserHandle(int subscriptionId, @Nullable UserHandle userHandle) {
		public void setSubscriptionUserHandle(int subscriptionId, @Nullable UserHandle userHandle) {
		if (!isValidSubscriptionId(subscriptionId)) {
		throw new IllegalArgumentException("[setUserHandle]: Invalid subscriptionId: "
		+ subscriptionId);
		throw new IllegalArgumentException("[setSubscriptionUserHandle]: "
		+ "Invalid subscriptionId: " + subscriptionId);
		}

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		if (iSub != null) {
		iSub.setUserHandle(userHandle, subscriptionId, mContext.getOpPackageName());
		iSub.setSubscriptionUserHandle(userHandle, subscriptionId);
		} else {
		throw new IllegalStateException("[setUserHandle]: "
		throw new IllegalStateException("[setSubscriptionUserHandle]: "
		+ "subscription service unavailable");
		}
		} catch (RemoteException ex) {
		@@ -4191,18 +4191,18 @@ public class SubscriptionManager {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION)
		public @Nullable UserHandle getUserHandle(int subscriptionId) {
		public @Nullable UserHandle getSubscriptionUserHandle(int subscriptionId) {
		if (!isValidSubscriptionId(subscriptionId)) {
		throw new IllegalArgumentException("[getUserHandle]: Invalid subscriptionId: "
		+ subscriptionId);
		throw new IllegalArgumentException("[getSubscriptionUserHandle]: "
		+ "Invalid subscriptionId: " + subscriptionId);
		}

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		if (iSub != null) {
		return iSub.getUserHandle(subscriptionId, mContext.getOpPackageName());
		return iSub.getSubscriptionUserHandle(subscriptionId);
		} else {
		throw new IllegalStateException("[getUserHandle]: "
		throw new IllegalStateException("[getSubscriptionUserHandle]: "
		+ "subscription service unavailable");
		}
		} catch (RemoteException ex) {

telephony/java/com/android/internal/telephony/ISub.aidl

+3 −5

Original line number	Diff line number	Diff line
		@@ -323,22 +323,20 @@ interface ISub {
		*
		* @param userHandle the user handle for this subscription
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage The package making the IPC.
		*
		* @throws SecurityException if doesn't have MANAGE_SUBSCRIPTION_USER_ASSOCIATION
		* @throws IllegalArgumentException if subId is invalid.
		*/
		int setUserHandle(in UserHandle userHandle, int subId, String callingPackage);
		int setSubscriptionUserHandle(in UserHandle userHandle, int subId);

		/**
		* Get UserHandle for this subscription
		*
		* @param subId the unique SubscriptionInfo index in database
		* @param callingPackage the package making the IPC
		* @return userHandle associated with this subscription.
		*
		* @throws SecurityException if doesn't have SMANAGE_SUBSCRIPTION_USER_ASSOCIATION
		* @throws SecurityException if doesn't have MANAGE_SUBSCRIPTION_USER_ASSOCIATION
		* @throws IllegalArgumentException if subId is invalid.
		*/
		UserHandle getUserHandle(int subId, String callingPackage);
		UserHandle getSubscriptionUserHandle(int subId);
		}