[RCS] Add IMS service into system service registry (304a66a3) · Commits · e / os / android_frameworks_base

api/system-current.txt

+36 −1

Original line number	Diff line number	Diff line
		@@ -1466,6 +1466,7 @@ 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 VR_SERVICE = "vrmanager";
		field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";
		@@ -9377,6 +9378,11 @@ package android.telephony.ims {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.ImsExternalCallState> CREATOR;
		}

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
		}

		public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
		method @NonNull 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;
		@@ -9420,6 +9426,22 @@ package android.telephony.ims {
		ctor @Deprecated public ImsMmTelManager.RegistrationCallback();
		}

		public class ImsRcsManager implements android.telephony.ims.RegistrationManager {
		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 void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isAvailable(int) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isCapable(int, int) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.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.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerRcsAvailabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterRcsAvailabilityCallback(@NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException;
		}

		public static class ImsRcsManager.AvailabilityCallback {
		ctor public ImsRcsManager.AvailabilityCallback();
		method public void onAvailabilityChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities);
		}

		public final class ImsReasonInfo implements android.os.Parcelable {
		field public static final String EXTRA_MSG_SERVICE_NOT_AUTHORIZED = "Forbidden. Not Authorized for Service";
		}
		@@ -9781,9 +9803,22 @@ package android.telephony.ims.feature {

		public class RcsFeature extends android.telephony.ims.feature.ImsFeature {
		ctor public RcsFeature();
		method public void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);
		method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);
		method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities);
		method public void onFeatureReady();
		method public void onFeatureRemoved();
		method public boolean queryCapabilityConfiguration(int, int);
		method @NonNull public final android.telephony.ims.feature.RcsFeature.RcsImsCapabilities queryCapabilityStatus();
		}

		public static class RcsFeature.RcsImsCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities {
		ctor public RcsFeature.RcsImsCapabilities(int);
		method public void addCapabilities(int);
		method public boolean isCapable(int);
		method public void removeCapabilities(int);
		field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
		field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
		field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
		}

		}

api/test-current.txt

+36 −1

Original line number	Diff line number	Diff line
		@@ -653,6 +653,7 @@ package android.content {
		field public static final String PERMISSION_SERVICE = "permission";
		field public static final String ROLLBACK_SERVICE = "rollback";
		field public static final String STATUS_BAR_SERVICE = "statusbar";
		field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";
		field public static final String TEST_NETWORK_SERVICE = "test_network";
		}

		@@ -3269,6 +3270,11 @@ package android.telephony.ims {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.ImsExternalCallState> CREATOR;
		}

		public class ImsManager {
		method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
		method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
		}

		public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
		method @NonNull public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(int);
		method @RequiresPermission("android.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;
		@@ -3312,6 +3318,22 @@ package android.telephony.ims {
		ctor @Deprecated public ImsMmTelManager.RegistrationCallback();
		}

		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 @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isAvailable(int) throws android.telephony.ims.ImsException;
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public boolean isCapable(int, int) throws android.telephony.ims.ImsException;
		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 registerRcsAvailabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException;
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterRcsAvailabilityCallback(@NonNull android.telephony.ims.ImsRcsManager.AvailabilityCallback) throws android.telephony.ims.ImsException;
		}

		public static class ImsRcsManager.AvailabilityCallback {
		ctor public ImsRcsManager.AvailabilityCallback();
		method public void onAvailabilityChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities);
		}

		public class ImsService extends android.app.Service {
		ctor public ImsService();
		method public android.telephony.ims.feature.MmTelFeature createMmTelFeature(int);
		@@ -3669,9 +3691,22 @@ package android.telephony.ims.feature {

		public class RcsFeature extends android.telephony.ims.feature.ImsFeature {
		ctor public RcsFeature();
		method public void changeEnabledCapabilities(android.telephony.ims.feature.CapabilityChangeRequest, android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);
		method public void changeEnabledCapabilities(@NonNull android.telephony.ims.feature.CapabilityChangeRequest, @NonNull android.telephony.ims.feature.ImsFeature.CapabilityCallbackProxy);
		method public final void notifyCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.RcsFeature.RcsImsCapabilities);
		method public void onFeatureReady();
		method public void onFeatureRemoved();
		method public boolean queryCapabilityConfiguration(int, int);
		method @NonNull public final android.telephony.ims.feature.RcsFeature.RcsImsCapabilities queryCapabilityStatus();
		}

		public static class RcsFeature.RcsImsCapabilities extends android.telephony.ims.feature.ImsFeature.Capabilities {
		ctor public RcsFeature.RcsImsCapabilities(int);
		method public void addCapabilities(int);
		method public boolean isCapable(int);
		method public void removeCapabilities(int);
		field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
		field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
		field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
		}

		}

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -1245,6 +1245,14 @@ final class SystemServiceRegistry {
		return new TimeZoneDetector();
		}});

		registerService(Context.TELEPHONY_IMS_SERVICE, android.telephony.ims.ImsManager.class,
		new CachedServiceFetcher<android.telephony.ims.ImsManager>() {
		@Override
		public android.telephony.ims.ImsManager createService(ContextImpl ctx) {
		return new android.telephony.ims.ImsManager(ctx.getOuterContext());
		}
		});

		registerService(Context.PERMISSION_SERVICE, PermissionManager.class,
		new CachedServiceFetcher<PermissionManager>() {
		@Override

core/java/android/content/Context.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -4821,6 +4821,8 @@ public abstract class Context {
		* {@link android.telephony.ims.ImsManager}.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";

		/**

telephony/java/android/telephony/ImsManager.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@

		package android.telephony.ims;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.content.Context;
		import android.telephony.SubscriptionManager;

		@@ -25,12 +28,15 @@ import android.telephony.SubscriptionManager;
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@SystemService(Context.TELEPHONY_IMS_SERVICE)
		public class ImsManager {

		private Context mContext;

		public ImsManager(Context context) {
		/** @hide */
		public ImsManager(@NonNull Context context) {
		mContext = context;
		}

		@@ -41,6 +47,7 @@ public class ImsManager {
		* @throws IllegalArgumentException if the subscription is invalid.
		* @return a ImsRcsManager instance with the specific subscription ID.
		*/
		@NonNull
		public ImsRcsManager getImsRcsManager(int subscriptionId) {
		if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
		throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId);
		@@ -56,6 +63,7 @@ public class ImsManager {
		* @throws IllegalArgumentException if the subscription is invalid.
		* @return a ImsMmTelManager instance with the specific subscription ID.
		*/
		@NonNull
		public ImsMmTelManager getImsMmTelManager(int subscriptionId) {
		if (!SubscriptionManager.isValidSubscriptionId(subscriptionId)) {
		throw new IllegalArgumentException("Invalid subscription ID: " + subscriptionId);