Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using RegistrationManager was causing unintended public APIs

Browse Source 
Remove the dependency on this interface until it is intended
to be public.

Fixes: 153908410
Test: atest CtsTelephonyTestCases
Change-Id: Iad82b7d06738468861bd49164fbb4b4dafb8c014
This commit is contained in:
Brad Ebinger
2020-04-14 15:17:46 -07:00
parent a18e52f648
commit db3e8ee013
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -48762,12 +48762,8 @@ package android.telephony.ims {
method public void onCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.MmTelFeature.MmTelCapabilities); method public void onCapabilitiesStatusChanged(@NonNull android.telephony.ims.feature.MmTelFeature.MmTelCapabilities);
} }
public class ImsRcsManager implements android.telephony.ims.RegistrationManager { public class ImsRcsManager {
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 @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"; field public static final String ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN = "android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN";
} }

24
telephony/java/android/telephony/ims/ImsRcsManager.java
View File

@@ -49,7 +49,7 @@ import java.util.function.Consumer;
* *
* Use {@link ImsManager#getImsRcsManager(int)} to create an instance of this manager. * Use {@link ImsManager#getImsRcsManager(int)} to create an instance of this manager.
*/ */
public class ImsRcsManager implements RegistrationManager { public class ImsRcsManager {
private static final String TAG = "ImsRcsManager"; private static final String TAG = "ImsRcsManager";
/** /**
@@ -173,11 +173,11 @@ public class ImsRcsManager implements RegistrationManager {
/** /**
* @hide * @hide
*/ */
@Override // @Override add back to RegistrationManager interface once public.
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void registerImsRegistrationCallback( public void registerImsRegistrationCallback(
@NonNull @CallbackExecutor Executor executor, @NonNull @CallbackExecutor Executor executor,
@NonNull RegistrationCallback c) @NonNull RegistrationManager.RegistrationCallback c)
throws ImsException { throws ImsException {
if (c == null) { if (c == null) {
throw new IllegalArgumentException("Must include a non-null RegistrationCallback."); throw new IllegalArgumentException("Must include a non-null RegistrationCallback.");
@@ -204,7 +204,7 @@ public class ImsRcsManager implements RegistrationManager {
/** /**
* @hide * @hide
*/ */
@Override // @Override add back to RegistrationManager interface once public.
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void unregisterImsRegistrationCallback( public void unregisterImsRegistrationCallback(
@NonNull RegistrationManager.RegistrationCallback c) { @NonNull RegistrationManager.RegistrationCallback c) {
@@ -228,10 +228,10 @@ public class ImsRcsManager implements RegistrationManager {
/** /**
* @hide * @hide
*/ */
@Override // @Override add back to RegistrationManager interface once public.
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void getRegistrationState(@NonNull @CallbackExecutor Executor executor, public void getRegistrationState(@NonNull @CallbackExecutor Executor executor,
@NonNull @ImsRegistrationState Consumer<Integer> stateCallback) { @NonNull @RegistrationManager.ImsRegistrationState Consumer<Integer> stateCallback) {
if (stateCallback == null) { if (stateCallback == null) {
throw new IllegalArgumentException("Must include a non-null stateCallback."); throw new IllegalArgumentException("Must include a non-null stateCallback.");
} }
@@ -260,7 +260,6 @@ public class ImsRcsManager implements RegistrationManager {
/** /**
* @hide * @hide
*/ */
@Override
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void getRegistrationTransportType(@NonNull @CallbackExecutor Executor executor, public void getRegistrationTransportType(@NonNull @CallbackExecutor Executor executor,
@NonNull @AccessNetworkConstants.TransportType @NonNull @AccessNetworkConstants.TransportType
@@ -347,8 +346,7 @@ public class ImsRcsManager implements RegistrationManager {
* inactive subscription, it will result in a no-op. * inactive subscription, it will result in a no-op.
* @param c The RCS {@link AvailabilityCallback} to be removed. * @param c The RCS {@link AvailabilityCallback} to be removed.
* @see #registerRcsAvailabilityCallback(Executor, AvailabilityCallback) * @see #registerRcsAvailabilityCallback(Executor, AvailabilityCallback)
* @throws ImsException if the IMS service is not available when calling this method * @throws ImsException if the IMS service is not available when calling this method.
* {@link ImsRcsController#unregisterRcsAvailabilityCallback()}.
* See {@link ImsException#getCode()} for more information on the error codes. * See {@link ImsException#getCode()} for more information on the error codes.
* @hide * @hide
*/ */
@@ -390,8 +388,7 @@ public class ImsRcsManager implements RegistrationManager {
* rather the subscription is capable of this service over IMS. * rather the subscription is capable of this service over IMS.
* @see #isAvailable(int) * @see #isAvailable(int)
* @see android.telephony.CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL * @see android.telephony.CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL
* @throws ImsException if the IMS service is not available when calling this method * @throws ImsException if the IMS service is not available when calling this method.
* {@link ImsRcsController#isCapable(int, int)}.
* See {@link ImsException#getCode()} for more information on the error codes. * See {@link ImsException#getCode()} for more information on the error codes.
* @hide * @hide
*/ */
@@ -424,9 +421,8 @@ public class ImsRcsManager implements RegistrationManager {
* @return true if the RCS capability is currently available for the associated subscription, * @return true if the RCS capability is currently available for the associated subscription,
* false otherwise. If the capability is available, IMS is registered and the service is * false otherwise. If the capability is available, IMS is registered and the service is
* currently available over IMS. * currently available over IMS.
* @see #isCapable(int) * @see #isCapable(int, int)
* @throws ImsException if the IMS service is not available when calling this method * @throws ImsException if the IMS service is not available when calling this method.
* {@link ImsRcsController#isAvailable(int, int)}.
* See {@link ImsException#getCode()} for more information on the error codes. * See {@link ImsException#getCode()} for more information on the error codes.
* @hide * @hide
*/ */