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

Commit c97c86cd authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Integrate ACCESS_IMS_SINGLE_REGISTRATION into APIS" into sc-dev am: 14c72817 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib44881898ae7ec5de972c66b76b65535421a6dc2
parents f267b14d 14c72817

core/api/system-current.txt

+11 −11
Original line number Diff line number Diff line
@@ -11859,7 +11859,7 @@ package android.telephony { 
  }















  public class TelephonyManager {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void bootstrapAuthenticationRequest(int, @NonNull android.net.Uri, @NonNull android.telephony.gba.UaSecurityProtocolIdentifier, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.BootstrapAuthenticationCallback);













    method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) @WorkerThread public void bootstrapAuthenticationRequest(int, @NonNull android.net.Uri, @NonNull android.telephony.gba.UaSecurityProtocolIdentifier, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.BootstrapAuthenticationCallback);















    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);















    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult changeIccLockPin(@NonNull String, @NonNull String);















    method public int checkCarrierPrivilegesForPackage(String);










@@ -13307,19 +13307,19 @@ package android.telephony.ims {













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);















    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public String getProvisioningStringValue(int);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isRcsVolteSingleRegistrationCapable() throws android.telephony.ims.ImsException;













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public boolean isRcsVolteSingleRegistrationCapable() throws android.telephony.ims.ImsException;















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyRcsAutoConfigurationReceived(@NonNull byte[], boolean);















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.Callback) throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerRcsProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback) throws android.telephony.ims.ImsException;













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void registerRcsProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback) throws android.telephony.ims.ImsException;















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningIntValue(int, int);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRcsClientConfiguration(@NonNull android.telephony.ims.RcsClientConfiguration) throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void setRcsClientConfiguration(@NonNull android.telephony.ims.RcsClientConfiguration) throws android.telephony.ims.ImsException;















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void triggerRcsReconfiguration();













    method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void triggerRcsReconfiguration();















    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterRcsProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);













    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE = "android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE";













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void unregisterRcsProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);













    field @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE = "android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE";















    field public static final String EXTRA_STATUS = "android.telephony.ims.extra.STATUS";















    field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.ims.extra.SUBSCRIPTION_ID";















    field public static final int KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID = 67; // 0x43










@@ -13584,10 +13584,10 @@ package android.telephony.ims {













  }





























  public class SipDelegateManager {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void createSipDelegate(@NonNull android.telephony.ims.DelegateRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.stub.DelegateConnectionStateCallback, @NonNull android.telephony.ims.stub.DelegateConnectionMessageCallback) throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void destroySipDelegate(@NonNull android.telephony.ims.SipDelegateConnection, int);













    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSupported() throws android.telephony.ims.ImsException;













    method public void triggerFullNetworkRegistration(@NonNull android.telephony.ims.SipDelegateConnection, @IntRange(from=100, to=699) int, @Nullable String);













    method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void createSipDelegate(@NonNull android.telephony.ims.DelegateRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.stub.DelegateConnectionStateCallback, @NonNull android.telephony.ims.stub.DelegateConnectionMessageCallback) throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void destroySipDelegate(@NonNull android.telephony.ims.SipDelegateConnection, int);













    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public boolean isSupported() throws android.telephony.ims.ImsException;













    method @RequiresPermission(android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION) public void triggerFullNetworkRegistration(@NonNull android.telephony.ims.SipDelegateConnection, @IntRange(from=100, to=699) int, @Nullable String);















    field public static final int DENIED_REASON_INVALID = 4; // 0x4















    field public static final int DENIED_REASON_IN_USE_BY_ANOTHER_DELEGATE = 1; // 0x1















    field public static final int DENIED_REASON_NOT_ALLOWED = 2; // 0x2

























telephony/common/com/android/internal/telephony/TelephonyPermissions.java



+61
−0






























Original line number
Diff line number
Diff line








@@ -685,6 +685,67 @@ public final class TelephonyPermissions {













        }















    }





























    /**













     * Given a list of permissions, check to see if the caller has at least one of them. If the













     * caller has none of these permissions, throw a SecurityException.













     */













    public static void enforceAnyPermissionGranted(Context context, int uid, String message,













            String... permissions) {













        if (permissions.length == 0) return;













        boolean isGranted = false;













        for (String perm : permissions) {













            if (context.checkCallingOrSelfPermission(perm) == PERMISSION_GRANTED) {













                isGranted = true;













                break;













            }













        }



























        if (isGranted) return;



























        StringBuilder b = new StringBuilder(message);













        b.append(": Neither user ");













        b.append(uid);













        b.append(" nor current process has ");













        b.append(permissions[0]);













        for (int i = 1; i < permissions.length; i++) {













            b.append(" or ");













            b.append(permissions[i]);













        }













        throw new SecurityException(b.toString());













    }



























    /**













     * Given a list of permissions, check to see if the caller has at least one of them granted. If













     * not, check to see if the caller has carrier privileges. If the caller does not have any  of













     * these permissions, throw a SecurityException.













     */













    public static void enforceAnyPermissionGrantedOrCarrierPrivileges(Context context, int subId,













            int uid, String message, String... permissions) {













        if (permissions.length == 0) return;













        boolean isGranted = false;













        for (String perm : permissions) {













            if (context.checkCallingOrSelfPermission(perm) == PERMISSION_GRANTED) {













                isGranted = true;













                break;













            }













        }



























        if (isGranted) return;













        if (checkCarrierPrivilegeForSubId(context, subId)) return;



























        StringBuilder b = new StringBuilder(message);













        b.append(": Neither user ");













        b.append(uid);













        b.append(" nor current process has ");













        b.append(permissions[0]);













        for (int i = 1; i < permissions.length; i++) {













            b.append(" or ");













            b.append(permissions[i]);













        }













        b.append(" or carrier privileges");













        throw new SecurityException(b.toString());













    }





























    /**















     * Throws if the caller is not of a shell (or root) UID.















     *

































telephony/java/android/telephony/TelephonyManager.java



+9
−3






























Original line number
Diff line number
Diff line








@@ -15216,8 +15216,13 @@ public class TelephonyManager {













     *     <li>Generate the ks_NAF/ ks_Ext_NAF to be returned via the callback.</li>















     * </ol>















     *













     * <p> Requires Permission: MODIFY_PHONE_STATE or that the calling app has carrier













     * privileges (see {@link #hasCarrierPrivileges}).













     * <p> Requires Permission:













     * <ul>













     *     <li>{@link android.Manifest.permission#MODIFY_PHONE_STATE},</li>













     *     <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>













     *     <li>or that the caller has carrier privileges (see













     *         {@link TelephonyManager#hasCarrierPrivileges()}).</li>













     * </ul>















     * @param appType icc application type, like {@link #APPTYPE_USIM} or {@link















     * #APPTYPE_ISIM} or {@link#APPTYPE_UNKNOWN}















     * @param nafId Network Application Function(NAF) fully qualified domain name and









@@ -15244,7 +15249,8 @@ public class TelephonyManager {













     */















    @SystemApi















    @WorkerThread













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresPermission(anyOf = {android.Manifest.permission.MODIFY_PHONE_STATE,













            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})















    public void bootstrapAuthenticationRequest(















            @UiccAppTypeExt int appType, @NonNull Uri nafId,















            @NonNull UaSecurityProtocolIdentifier securityProtocol,

























telephony/java/android/telephony/ims/ProvisioningManager.java



+63
−36






























Original line number
Diff line number
Diff line








@@ -32,6 +32,7 @@ import android.os.ServiceSpecificException;













import android.telephony.CarrierConfigManager;















import android.telephony.SubscriptionManager;















import android.telephony.TelephonyFrameworkInitializer;













import android.telephony.TelephonyManager;















import android.telephony.ims.aidl.IImsConfigCallback;















import android.telephony.ims.aidl.IRcsConfigCallback;















import android.telephony.ims.feature.MmTelFeature;










@@ -1300,7 +1301,7 @@ public class ProvisioningManager {













     * provisioning.















     * <p>















     * Requires Permission: Manifest.permission.MODIFY_PHONE_STATE or that the calling app has













     * carrier privileges (see {@link #hasCarrierPrivileges}).













     * carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).















     * @param config The XML file to be read. ASCII/UTF8 encoded text if not compressed.















     * @param isCompressed The XML file is compressed in gzip format and must be decompressed















     *         before being read.










@@ -1330,7 +1331,7 @@ public class ProvisioningManager {













     * the intent is valid. and {@link #EXTRA_STATUS} to specify RCS VoLTE single registration















     * status.















     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)















    public static final String ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE =















            "android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE";










@@ -1375,7 +1376,7 @@ public class ProvisioningManager {













     * provisioning status events {@link #registerRcsProvisioningChangedCallback}















     * @param rcc RCS client configuration {@link RcsClientConfiguration}















     */













    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    public void setRcsClientConfiguration(















            @NonNull RcsClientConfiguration rcc) throws ImsException {















        try {









@@ -1390,6 +1391,14 @@ public class ProvisioningManager {













    /**















     * Returns a flag to indicate whether or not the device supports IMS single registration for















     * MMTEL and RCS features as well as if the carrier has provisioned the feature.













     *













     * <p> Requires Permission:













     * <ul>













     *     <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>













     *     <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>













     *     <li>or that the caller has carrier privileges (see













     *         {@link TelephonyManager#hasCarrierPrivileges()}).</li>













     * </ul>















     * @return true if IMS single registration is capable at this time, or false otherwise















     * @throws ImsException If the remote ImsService is not available for















     * any reason or the subscription associated with this instance is no









@@ -1398,7 +1407,8 @@ public class ProvisioningManager {













     * @see PackageManager#FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION for whether or not this















     * device supports IMS single registration.















     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,













            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})















    public boolean isRcsVolteSingleRegistrationCapable() throws ImsException {















        try {















            return getITelephony().isRcsVolteSingleRegistrationCapable(mSubId);









@@ -1420,6 +1430,13 @@ public class ProvisioningManager {













    * immediately with the xml.















    * When the subscription associated with this callback is removed (SIM removed,















    * ESIM swap,etc...), this callback will automatically be removed.













    * <p> Requires Permission:













    * <ul>













    *     <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>













    *     <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>













    *     <li>or that the caller has carrier privileges (see













    *         {@link TelephonyManager#hasCarrierPrivileges()}).</li>













    * </ul>















    *















    * @param executor The {@link Executor} to call the callback methods on















    * @param callback The rcs provisioning callback to be registered.









@@ -1437,7 +1454,8 @@ public class ProvisioningManager {













    * callback.















    * See {@link ImsException#getCode()} for a more detailed reason.















    */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,













            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})















    public void registerRcsProvisioningChangedCallback(















            @NonNull @CallbackExecutor Executor executor,















            @NonNull RcsProvisioningCallback callback) throws ImsException {









@@ -1459,13 +1477,22 @@ public class ProvisioningManager {













     * removed, ESIM swap, etc...), this callback will automatically be















     * removed. If this method is called for an inactive subscription, it















     * will result in a no-op.













     * <p> Requires Permission:













     * <ul>













     *     <li>{@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE},</li>













     *     <li>{@link android.Manifest.permission#PERFORM_IMS_SINGLE_REGISTRATION},</li>













     *     <li>or that the caller has carrier privileges (see













     *         {@link TelephonyManager#hasCarrierPrivileges()}).</li>













     * </ul>













     *















     * @param callback The existing {@link RcsProvisioningCallback} to be















     * removed.















     * @see #registerRcsProvisioningChangedCallback















     * @throws IllegalArgumentException if the subscription associated with this callback is















     * invalid.















     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,













            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})















    public void unregisterRcsProvisioningChangedCallback(















            @NonNull RcsProvisioningCallback callback) {















        try {









@@ -1480,7 +1507,7 @@ public class ProvisioningManager {













     * Reconfiguration triggered by the RCS application. Most likely cause















     * is the 403 forbidden to a HTTP request.















     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    public void triggerRcsReconfiguration() {















        try {















            getITelephony().triggerRcsReconfiguration(mSubId);

































telephony/java/android/telephony/ims/SipDelegateManager.java



+5
−3






























Original line number
Diff line number
Diff line








@@ -275,7 +275,8 @@ public class SipDelegateManager {













     * @see CarrierConfigManager.Ims#KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL















     * @see PackageManager#FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION















     */













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    @RequiresPermission(anyOf = {Manifest.permission.READ_PRIVILEGED_PHONE_STATE,













            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})















    public boolean isSupported() throws ImsException {















        try {















            IImsRcsController controller = mBinderCache.getBinder();










@@ -317,7 +318,7 @@ public class SipDelegateManager {













     * @throws ImsException Thrown if there was a problem communicating with the ImsService















     * associated with this SipDelegateManager. See {@link ImsException#getCode()}.















     */













    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    public void createSipDelegate(@NonNull DelegateRequest request, @NonNull Executor executor,















            @NonNull DelegateConnectionStateCallback dc,















            @NonNull DelegateConnectionMessageCallback mc) throws ImsException {










@@ -351,7 +352,7 @@ public class SipDelegateManager {













     * @param delegateConnection The SipDelegateConnection to destroy.















     * @param reason The reason for why this SipDelegateConnection was destroyed.















     */













    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    public void destroySipDelegate(@NonNull SipDelegateConnection delegateConnection,















            @SipDelegateDestroyReason int reason) {


























@@ -392,6 +393,7 @@ public class SipDelegateManager {













     *         this condition. May be {@code null} if there was no reason String provided from the















     *         network.















     */













    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)















    public void triggerFullNetworkRegistration(@NonNull SipDelegateConnection connection,















            @IntRange(from = 100, to = 699) int sipCode, @Nullable String sipReason) {















        if (connection == null) {