Merge "Add new capability polling opt-in intent" into rvc-dev am: cd31f739da am: 6c7a529add (45150b77) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -48769,6 +48769,7 @@ package android.telephony.ims {

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
		field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
		field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
		field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
		@@ -48797,6 +48798,15 @@ package android.telephony.ims {
		method public void onCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.MmTelFeature.MmTelCapabilities);
		}

		public class ImsRcsManager implements android.telephony.ims.RegistrationManager {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);
		field public static final String ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN = "android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN";
		}

		public final class ImsReasonInfo implements android.os.Parcelable {
		ctor public ImsReasonInfo(int, int, @Nullable String);
		method public int describeContents();
		@@ -48980,6 +48990,10 @@ package android.telephony.ims {
		field public static final int EXTRA_CODE_CALL_RETRY_SILENT_REDIAL = 2; // 0x2
		}

		public class RcsUceAdapter {
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
		}

		public interface RegistrationManager {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

api/system-current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -12410,7 +12410,6 @@ package android.telephony.ims {
		}

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
		field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
		}

		@@ -12438,10 +12437,6 @@ package android.telephony.ims {
		ctor @Deprecated public ImsMmTelManager.RegistrationCallback();
		}

		public class ImsRcsManager implements android.telephony.ims.RegistrationManager {
		method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter();
		}

		public final class ImsReasonInfo implements android.os.Parcelable {
		field public static final String EXTRA_MSG_SERVICE_NOT_AUTHORIZED = "Forbidden. Not Authorized for Service";
		}
		@@ -12818,7 +12813,6 @@ package android.telephony.ims {
		}

		public class RcsUceAdapter {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException;
		}

api/test-current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -3997,7 +3997,6 @@ package android.telephony.ims {
		}

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
		field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
		}

		@@ -4025,10 +4024,6 @@ package android.telephony.ims {
		ctor @Deprecated public ImsMmTelManager.RegistrationCallback();
		}

		public class ImsRcsManager implements android.telephony.ims.RegistrationManager {
		method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter();
		}

		public class ImsService extends android.app.Service {
		ctor public ImsService();
		method public android.telephony.ims.feature.MmTelFeature createMmTelFeature(int);
		@@ -4401,7 +4396,6 @@ package android.telephony.ims {
		}

		public class RcsUceAdapter {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException;
		}

core/java/android/provider/Telephony.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5120,8 +5120,8 @@ public final class Telephony {
		public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";

		/**
		* Determines if the user has enabled IMS RCS User Capability Exchange (UCE) for this
		* subscription.
		* TelephonyProvider column name for determining if the user has enabled IMS RCS User
		* Capability Exchange (UCE) for this subscription.
		*/
		public static final String IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled";

telephony/java/android/telephony/ImsManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -103,10 +103,7 @@ public class ImsManager {
		* @param subscriptionId The ID of the subscription that this ImsRcsManager will use.
		* @throws IllegalArgumentException if the subscription is invalid.
		* @return a ImsRcsManager instance with the specific subscription ID.
		* @hide
		*/
		@SystemApi
		@TestApi
		@NonNull
		public ImsRcsManager getImsRcsManager(int subscriptionId) {
		if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {