Merge "Define new permission to perform IMS RCS Reg actions and integrate... (ca282c8c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+12 −11

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ package android {
		field public static final String PACKET_KEEPALIVE_OFFLOAD = "android.permission.PACKET_KEEPALIVE_OFFLOAD";
		field public static final String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS";
		field public static final String PERFORM_CDMA_PROVISIONING = "android.permission.PERFORM_CDMA_PROVISIONING";
		field public static final String PERFORM_IMS_SINGLE_REGISTRATION = "android.permission.PERFORM_IMS_SINGLE_REGISTRATION";
		field public static final String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";
		field public static final String POWER_SAVER = "android.permission.POWER_SAVER";
		field public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";
		@@ -10069,7 +10070,7 @@ package android.telephony {
		}

		public class TelephonyManager {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void bootstrapAuthenticationRequest(int, @NonNull android.net.Uri, @NonNull android.telephony.gba.UaSecurityProtocolIdentifier, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.BootstrapAuthenticationCallback);
		method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) @WorkerThread public void bootstrapAuthenticationRequest(int, @NonNull android.net.Uri, @NonNull android.telephony.gba.UaSecurityProtocolIdentifier, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.BootstrapAuthenticationCallback);
		method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);
		method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult changeIccLockPin(@NonNull String, @NonNull String);
		method public int checkCarrierPrivilegesForPackage(String);
		@@ -11510,19 +11511,19 @@ package android.telephony.ims {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isRcsVolteSingleRegistrationCapable() throws android.telephony.ims.ImsException;
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public boolean isRcsVolteSingleRegistrationCapable() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyRcsAutoConfigurationReceived(@NonNull byte[], boolean);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerRcsProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void registerRcsProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRcsClientConfiguration(@NonNull android.telephony.ims.RcsClientConfiguration) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void setRcsClientConfiguration(@NonNull android.telephony.ims.RcsClientConfiguration) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void triggerRcsReconfiguration();
		method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void triggerRcsReconfiguration();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterRcsProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);
		field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE = "android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE";
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void unregisterRcsProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);
		field @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE = "android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE";
		field public static final String EXTRA_STATUS = "android.telephony.ims.extra.STATUS";
		field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.ims.extra.SUBSCRIPTION_ID";
		field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43
		@@ -11787,10 +11788,10 @@ package android.telephony.ims {
		}

		public class SipDelegateManager {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void createSipDelegate(@NonNull android.telephony.ims.DelegateRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.stub.DelegateConnectionStateCallback, @NonNull android.telephony.ims.stub.DelegateConnectionMessageCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void destroySipDelegate(@NonNull android.telephony.ims.SipDelegateConnection, int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSupported() throws android.telephony.ims.ImsException;
		method public void triggerFullNetworkRegistration(@NonNull android.telephony.ims.SipDelegateConnection, @IntRange(from=100, to=699) int, @Nullable String);
		method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void createSipDelegate(@NonNull android.telephony.ims.DelegateRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.stub.DelegateConnectionStateCallback, @NonNull android.telephony.ims.stub.DelegateConnectionMessageCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void destroySipDelegate(@NonNull android.telephony.ims.SipDelegateConnection, int);
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public boolean isSupported() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void triggerFullNetworkRegistration(@NonNull android.telephony.ims.SipDelegateConnection, @IntRange(from=100, to=699) int, @Nullable String);
		field public static final int DENIED_REASON_INVALID = 4; // 0x4
		field public static final int DENIED_REASON_IN_USE_BY_ANOTHER_DELEGATE = 1; // 0x1
		field public static final int DENIED_REASON_NOT_ALLOWED = 2; // 0x2

core/res/AndroidManifest.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -1032,6 +1032,14 @@
		android:description="@string/permdesc_accessImsCallService"
		android:protectionLevel="signature\|privileged" />

		<!-- @SystemApi @hide Allows an application to perform IMS Single Registration related actions.
		Only granted if the application is a system app AND is in the Default SMS Role.
		The permission is revoked when the app is taken out of the Default SMS Role.
		<p>Protection level: signature\|privileged
		-->
		<permission android:name="android.permission.PERFORM_IMS_SINGLE_REGISTRATION"
		android:protectionLevel="signature\|privileged" />

		<!-- Allows an application to read the user's call log.
		<p class="note"><strong>Note:</strong> If your app uses the
		{@link #READ_CONTACTS} permission and <em>both</em> your <a

data/etc/privapp-permissions-platform.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -353,6 +353,7 @@ applications that come with the platform
		<permission name="android.permission.PACKAGE_USAGE_STATS" />
		<!-- Needed for test only -->
		<permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />
		<permission name="android.permission.PERFORM_IMS_SINGLE_REGISTRATION" />
		<permission name="android.permission.POWER_SAVER" />
		<permission name="android.permission.READ_CARRIER_APP_INFO"/>
		<permission name="android.permission.READ_FRAME_BUFFER"/>

packages/Shell/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -339,6 +339,9 @@
		<!-- Permission required for CTS test - CtsTelephonyTestCases -->
		<uses-permission android:name="android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE" />

		<!-- Permission required for CTS test - CtsTelephonyTestCases -->
		<uses-permission android:name="android.permission.PERFORM_IMS_SINGLE_REGISTRATION" />

		<!-- Permission needed for CTS test - DisplayTest -->
		<uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" />

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+61 −0

Original line number	Diff line number	Diff line
		@@ -639,6 +639,67 @@ public final class TelephonyPermissions {
		}
		}

		/**
		* Given a list of permissions, check to see if the caller has at least one of them. If the
		* caller has none of these permissions, throw a SecurityException.
		*/
		public static void enforceAnyPermissionGranted(Context context, int uid, String message,
		String... permissions) {
		if (permissions.length == 0) return;
		boolean isGranted = false;
		for (String perm : permissions) {
		if (context.checkCallingOrSelfPermission(perm) == PERMISSION_GRANTED) {
		isGranted = true;
		break;
		}
		}

		if (isGranted) return;

		StringBuilder b = new StringBuilder(message);
		b.append(": Neither user ");
		b.append(uid);
		b.append(" nor current process has ");
		b.append(permissions[0]);
		for (int i = 1; i < permissions.length; i++) {
		b.append(" or ");
		b.append(permissions[i]);
		}
		throw new SecurityException(b.toString());
		}

		/**
		* Given a list of permissions, check to see if the caller has at least one of them granted. If
		* not, check to see if the caller has carrier privileges. If the caller does not have any of
		* these permissions, throw a SecurityException.
		*/
		public static void enforceAnyPermissionGrantedOrCarrierPrivileges(Context context, int subId,
		int uid, String message, String... permissions) {
		if (permissions.length == 0) return;
		boolean isGranted = false;
		for (String perm : permissions) {
		if (context.checkCallingOrSelfPermission(perm) == PERMISSION_GRANTED) {
		isGranted = true;
		break;
		}
		}

		if (isGranted) return;
		if (checkCarrierPrivilegeForSubId(context, subId)) return;

		StringBuilder b = new StringBuilder(message);
		b.append(": Neither user ");
		b.append(uid);
		b.append(" nor current process has ");
		b.append(permissions[0]);
		for (int i = 1; i < permissions.length; i++) {
		b.append(" or ");
		b.append(permissions[i]);
		}
		b.append(" or carrier privileges");
		throw new SecurityException(b.toString());
		}

		/**
		* Throws if the caller is not of a shell (or root) UID.
		*