Merge changes from topics "cp_rcs_uce_setting", "ims_uce_system" am: e86be6d43e am: f590f0a019 (44710acb) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −1

Original line number	Diff line number	Diff line
		@@ -9873,6 +9873,7 @@ package android.content {
		field public static final String STORAGE_STATS_SERVICE = "storagestats";
		field public static final String SYSTEM_HEALTH_SERVICE = "systemhealth";
		field public static final String TELECOM_SERVICE = "telecom";
		field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";
		field public static final String TELEPHONY_SERVICE = "phone";
		field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		@@ -46391,13 +46392,20 @@ package android.telephony.ims {

		public final class ImsException extends java.lang.Exception {
		method public int getCode();
		field public static final int CODE_ERROR_INVALID_SUBSCRIPTION = 3; // 0x3
		field public static final int CODE_ERROR_SERVICE_UNAVAILABLE = 1; // 0x1
		field public static final int CODE_ERROR_UNSPECIFIED = 0; // 0x0
		field public static final int CODE_ERROR_UNSUPPORTED_OPERATION = 2; // 0x2
		}

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(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";
		}

		public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
		method @NonNull @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
		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(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public int getVoWiFiModeSetting();

api/system-current.txt

+82 −9

Original line number	Diff line number	Diff line
		@@ -1590,7 +1590,6 @@ package android.content {
		field public static final String STATS_MANAGER = "stats";
		field public static final String STATUS_BAR_SERVICE = "statusbar";
		field public static final String SYSTEM_UPDATE_SERVICE = "system_update";
		field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";
		field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";
		field public static final String TETHERING_SERVICE = "tethering";
		field public static final String VR_SERVICE = "vrmanager";
		@@ -10162,15 +10161,12 @@ 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_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
		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";
		}

		public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
		method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getFeatureState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getVoWiFiRoamingModeSetting();
		@@ -10538,8 +10534,8 @@ package android.telephony.ims {
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getCapableExtensionTags();
		method @NonNull public android.net.Uri getContactUri();
		method @Nullable public android.net.Uri getServiceUri(int);
		method public boolean isCapable(int);
		method @Nullable public android.net.Uri getServiceUri(long);
		method public boolean isCapable(long);
		method public boolean isCapable(@NonNull String);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int CAPABILITY_CALL_COMPOSER = 4194304; // 0x400000
		@@ -10561,6 +10557,7 @@ package android.telephony.ims {
		field public static final int CAPABILITY_IMAGE_SHARE = 256; // 0x100
		field public static final int CAPABILITY_IP_VIDEO_CALL = 16384; // 0x4000
		field public static final int CAPABILITY_IP_VOICE_CALL = 8192; // 0x2000
		field public static final int CAPABILITY_MMTEL_CALL_COMPOSER = 1073741824; // 0x40000000
		field public static final int CAPABILITY_PLUG_IN = 268435456; // 0x10000000
		field public static final int CAPABILITY_POST_CALL = 8388608; // 0x800000
		field public static final int CAPABILITY_RCS_VIDEO_CALL = 1048576; // 0x100000
		@@ -10569,6 +10566,7 @@ package android.telephony.ims {
		field public static final int CAPABILITY_SHARED_MAP = 16777216; // 0x1000000
		field public static final int CAPABILITY_SHARED_SKETCH = 33554432; // 0x2000000
		field public static final int CAPABILITY_SOCIAL_PRESENCE = 2048; // 0x800
		field public static final int CAPABILITY_STANDALONE_CHAT_BOT = 536870912; // 0x20000000
		field public static final int CAPABILITY_VIDEO_SHARE = 1024; // 0x400
		field public static final int CAPABILITY_VIDEO_SHARE_DURING_CS_CALL = 512; // 0x200
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsContactUceCapability> CREATOR;
		@@ -10576,14 +10574,16 @@ package android.telephony.ims {

		public static class RcsContactUceCapability.Builder {
		ctor public RcsContactUceCapability.Builder(@NonNull android.net.Uri);
		method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int, @NonNull android.net.Uri);
		method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int);
		method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(long, @NonNull android.net.Uri);
		method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(long);
		method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(@NonNull String);
		method @NonNull public android.telephony.ims.RcsContactUceCapability build();
		}

		public class RcsUceAdapter {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getUcePublishState() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void requestCapabilities(@NonNull java.util.concurrent.Executor, @NonNull java.util.List<android.net.Uri>, @NonNull android.telephony.ims.RcsUceAdapter.CapabilitiesCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUceSettingEnabled(boolean) throws android.telephony.ims.ImsException;
		field public static final int ERROR_ALREADY_IN_QUEUE = 13; // 0xd
		field public static final int ERROR_FORBIDDEN = 6; // 0x6
		@@ -10605,6 +10605,12 @@ package android.telephony.ims {
		field public static final int PUBLISH_STATE_VOLTE_PROVISION_ERROR = 3; // 0x3
		}

		public static class RcsUceAdapter.CapabilitiesCallback {
		ctor public RcsUceAdapter.CapabilitiesCallback();
		method public void onCapabilitiesReceived(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>);
		method public void onError(int);
		}

		}

		package android.telephony.ims.feature {
		@@ -10694,6 +10700,8 @@ package android.telephony.ims.feature {
		public class RcsFeature extends android.telephony.ims.feature.ImsFeature {
		ctor public RcsFeature();
		method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);
		method @NonNull public android.telephony.ims.stub.RcsSipOptionsImplBase getOptionsExchangeImpl();
		method @NonNull public android.telephony.ims.stub.RcsPresenceExchangeImplBase getPresenceExchangeImpl();
		method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities);
		method public void onFeatureReady();
		method public void onFeatureRemoved();
		@@ -10886,6 +10894,71 @@ package android.telephony.ims.stub {
		field public static final int INVALID_RESULT = -1; // 0xffffffff
		}

		public class RcsCapabilityExchange {
		ctor public RcsCapabilityExchange();
		method public final void onCommandUpdate(int, int) throws android.telephony.ims.ImsException;
		field public static final int COMMAND_CODE_FETCH_ERROR = 4; // 0x4
		field public static final int COMMAND_CODE_GENERIC_FAILURE = 2; // 0x2
		field public static final int COMMAND_CODE_INSUFFICIENT_MEMORY = 6; // 0x6
		field public static final int COMMAND_CODE_INVALID_PARAM = 3; // 0x3
		field public static final int COMMAND_CODE_LOST_NETWORK_CONNECTION = 7; // 0x7
		field public static final int COMMAND_CODE_NOT_FOUND = 9; // 0x9
		field public static final int COMMAND_CODE_NOT_SUPPORTED = 8; // 0x8
		field public static final int COMMAND_CODE_NO_CHANGE_IN_CAP = 11; // 0xb
		field public static final int COMMAND_CODE_REQUEST_TIMEOUT = 5; // 0x5
		field public static final int COMMAND_CODE_SERVICE_UNAVAILABLE = 10; // 0xa
		field public static final int COMMAND_CODE_SERVICE_UNKNOWN = 0; // 0x0
		field public static final int COMMAND_CODE_SUCCESS = 1; // 0x1
		}

		public class RcsPresenceExchangeImplBase extends android.telephony.ims.stub.RcsCapabilityExchange {
		ctor public RcsPresenceExchangeImplBase();
		method public final void onCapabilityRequestResponse(@NonNull java.util.List<android.telephony.ims.RcsContactUceCapability>, int) throws android.telephony.ims.ImsException;
		method public final void onNetworkResponse(int, @NonNull String, int) throws android.telephony.ims.ImsException;
		method public final void onNotifyUpdateCapabilites(int) throws android.telephony.ims.ImsException;
		method public final void onUnpublish() throws android.telephony.ims.ImsException;
		method public void requestCapabilities(@NonNull java.util.List<android.net.Uri>, int);
		method public void updateCapabilities(@NonNull android.telephony.ims.RcsContactUceCapability, int);
		field public static final int CAPABILITY_UPDATE_TRIGGER_ETAG_EXPIRED = 0; // 0x0
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_2G = 6; // 0x6
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_3G = 5; // 0x5
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_EHRPD = 3; // 0x3
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_HSPAPLUS = 4; // 0x4
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_IWLAN = 8; // 0x8
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_DISABLED = 1; // 0x1
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_LTE_VOPS_ENABLED = 2; // 0x2
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_DISABLED = 10; // 0xa
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_NR5G_VOPS_ENABLED = 11; // 0xb
		field public static final int CAPABILITY_UPDATE_TRIGGER_MOVE_TO_WLAN = 7; // 0x7
		field public static final int CAPABILITY_UPDATE_TRIGGER_UNKNOWN = 9; // 0x9
		field public static final int RESPONSE_FORBIDDEN = 3; // 0x3
		field public static final int RESPONSE_NOT_AUTHORIZED_FOR_PRESENCE = 2; // 0x2
		field public static final int RESPONSE_NOT_FOUND = 4; // 0x4
		field public static final int RESPONSE_NOT_REGISTERED = 1; // 0x1
		field public static final int RESPONSE_SIP_INTERVAL_TOO_SHORT = 7; // 0x7
		field public static final int RESPONSE_SIP_REQUEST_TIMEOUT = 5; // 0x5
		field public static final int RESPONSE_SIP_SERVICE_UNAVAILABLE = 8; // 0x8
		field public static final int RESPONSE_SUBSCRIBE_GENERIC_FAILURE = -1; // 0xffffffff
		field public static final int RESPONSE_SUBSCRIBE_TOO_LARGE = 6; // 0x6
		field public static final int RESPONSE_SUCCESS = 0; // 0x0
		}

		public class RcsSipOptionsImplBase extends android.telephony.ims.stub.RcsCapabilityExchange {
		ctor public RcsSipOptionsImplBase();
		method public final void onCapabilityRequestResponse(int, @NonNull String, @Nullable android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException;
		method public final void onRemoteCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int) throws android.telephony.ims.ImsException;
		method public void respondToCapabilityRequest(@NonNull String, @NonNull android.telephony.ims.RcsContactUceCapability, int);
		method public void respondToCapabilityRequestWithError(@NonNull android.net.Uri, int, @NonNull String, int);
		method public void sendCapabilityRequest(@NonNull android.net.Uri, @NonNull android.telephony.ims.RcsContactUceCapability, int);
		field public static final int RESPONSE_BAD_REQUEST = 5; // 0x5
		field public static final int RESPONSE_DOES_NOT_EXIST_ANYWHERE = 4; // 0x4
		field public static final int RESPONSE_GENERIC_FAILURE = -1; // 0xffffffff
		field public static final int RESPONSE_NOT_FOUND = 3; // 0x3
		field public static final int RESPONSE_REQUEST_TIMEOUT = 2; // 0x2
		field public static final int RESPONSE_SUCCESS = 0; // 0x0
		field public static final int RESPONSE_TEMPORARILY_UNAVAILABLE = 1; // 0x1
		}

		}

		package android.telephony.mbms {

api/test-current.txt

+126 −5

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/content/Context.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -4854,10 +4854,7 @@ public abstract class Context {
		/**
		* Use with {@link #getSystemService(String)} to retrieve an
		* {@link android.telephony.ims.ImsManager}.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";

		/**

telephony/java/android/telephony/ImsManager.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -27,11 +27,7 @@ import android.telephony.SubscriptionManager;

		/**
		* Provides access to information about Telephony IMS services on the device.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@SystemService(Context.TELEPHONY_IMS_SERVICE)
		public class ImsManager {

		@@ -45,7 +41,10 @@ public class ImsManager {
		* <p class="note">
		* Carrier applications may listen to this broadcast to be notified of possible IMS provisioning
		* issues.
		* @hide
		*/
		@SystemApi
		@TestApi
		// Moved from TelephonyIntents, need to keep backwards compatibility with OEM apps that have
		// this value hard-coded in BroadcastReceiver.
		@SuppressLint("ActionValue")
		@@ -104,7 +103,10 @@ 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)) {