Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb6c846 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Add new capability polling opt-in intent 

Adds a new capability discovery opt-in intent,
which an application can use to prompt the user
to enable contact discovery.

Bug: 111305845
Test: atest CtsTelephonyTestCases; telecom test app
Merged-In: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
Change-Id: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
parent a6d47fba

api/current.txt

+14 −0
Original line number Diff line number Diff line
@@ -46530,6 +46530,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";










@@ -46558,6 +46559,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();










@@ -46741,6 +46751,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








@@ -9877,7 +9877,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";















  }
























@@ -9905,10 +9904,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";















  }










@@ -10285,7 +10280,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








@@ -3490,7 +3490,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";















  }


























@@ -3518,10 +3517,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);










@@ -3894,7 +3889,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;















  }

















































telephony/java/android/telephony/ImsManager.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -104,10 +104,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)) {

































telephony/java/android/telephony/ims/ImsException.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -47,11 +47,12 @@ public final class ImsException extends Exception {













    public static final int CODE_ERROR_SERVICE_UNAVAILABLE = 1;































    /**













     * This device or carrier configuration does not support IMS for this subscription.













     * This device or carrier configuration does not support this feature for this subscription.















     * <p>













     * This is a permanent configuration error and there should be no retry. Usually this is













     * because {@link PackageManager#FEATURE_TELEPHONY_IMS} is not available













     * or the device has no ImsService implementation to service this request.













     * This is a permanent configuration error and there should be no retry until the subscription













     * changes if this operation is denied due to a carrier configuration. If this is due to a













     * device configuration, the feature {@link PackageManager#FEATURE_TELEPHONY_IMS} is not













     * available or the device has no ImsService implementation to service this request.















     */















    public static final int CODE_ERROR_UNSUPPORTED_OPERATION = 2;