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

Commit f622e0e3 authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Update Provisioning API name and doc per API review" am: 629a24b2 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica3fad113ed39075cefa6f876a18f2badc2ca15c
parents e8d010e9 629a24b2

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11501,7 +11501,7 @@ package android.telephony.ims { 
    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(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(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void registerRcsProvisioningCallback(@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);
@@ -11509,7 +11509,7 @@ package android.telephony.ims { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);

    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(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void unregisterRcsProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.RcsProvisioningCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION}) public void unregisterRcsProvisioningCallback(@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";

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

+21 −10
Original line number Diff line number Diff line
@@ -1006,7 +1006,8 @@ public class ProvisioningManager { 
         * server) or other operator defined triggers. If RCS provisioning is already

         * completed at the time of callback registration, then this method shall be

         * invoked with the current configuration

         * @param configXml The RCS configurationXML received OTA.

         * @param configXml The RCS configuration XML received by OTA. It is defined

         * by GSMA RCC.07.

         */

        public void onConfigurationChanged(@NonNull byte[] configXml) {}
@@ -1373,7 +1374,9 @@ public class ProvisioningManager { 
     * provisioning is done using autoconfiguration, then these parameters shall be

     * sent in the HTTP get request to fetch the RCS provisioning. RCS client

     * configuration must be provided by the application before registering for the

     * provisioning status events {@link #registerRcsProvisioningChangedCallback}

     * provisioning status events {@link #registerRcsProvisioningCallback()}

     * When the IMS/RCS service receives the RCS client configuration, it will detect

     * the change in the configuration, and trigger the auto-configuration as needed.

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

     */

    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
@@ -1440,7 +1443,7 @@ public class ProvisioningManager { 
    *

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

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

    * @see #unregisterRcsProvisioningChangedCallback(RcsProvisioningCallback)

    * @see #unregisterRcsProvisioningCallback(RcsProvisioningCallback)

    * @see SubscriptionManager.OnSubscriptionsChangedListener

    * @throws IllegalArgumentException if the subscription associated with this

    * callback is not active (SIM is not inserted, ESIM inactive) or the
@@ -1456,12 +1459,12 @@ public class ProvisioningManager { 
    */

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

            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})

    public void registerRcsProvisioningChangedCallback(

    public void registerRcsProvisioningCallback(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull RcsProvisioningCallback callback) throws ImsException {

        callback.setExecutor(executor);

        try {

            getITelephony().registerRcsProvisioningChangedCallback(mSubId, callback.getBinder());

            getITelephony().registerRcsProvisioningCallback(mSubId, callback.getBinder());

        } catch (ServiceSpecificException e) {

            throw new ImsException(e.getMessage(), e.errorCode);

        } catch (RemoteException | IllegalStateException e) {
@@ -1487,16 +1490,16 @@ public class ProvisioningManager { 
     *

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

     * removed.

     * @see #registerRcsProvisioningChangedCallback

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

     * invalid.

     * @see #registerRcsProvisioningCallback(Executor, RcsProvisioningCallback)

     * @throws IllegalArgumentException if the subscription associated with

     * this callback is invalid.

     */

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

            Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION})

    public void unregisterRcsProvisioningChangedCallback(

    public void unregisterRcsProvisioningCallback(

            @NonNull RcsProvisioningCallback callback) {

        try {

            getITelephony().unregisterRcsProvisioningChangedCallback(

            getITelephony().unregisterRcsProvisioningCallback(

                    mSubId, callback.getBinder());

        } catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();
@@ -1506,6 +1509,14 @@ public class ProvisioningManager { 
    /**

     * Reconfiguration triggered by the RCS application. Most likely cause

     * is the 403 forbidden to a HTTP request.

     *

     * <p>When this api is called, the RCS configuration for the associated

     * subscription will be removed, and the application which has registered

     * {@link RcsProvisioningCallback} may expect to receive

     * {@link RcsProvisioningCallback#onConfigurationReset}, then

     * {@link RcsProvisioningCallback#onConfigurationChanged} when the new

     * RCS configuration is received and notified by

     * {@link #notifyRcsAutoConfigurationReceived}

     */

    @RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)

    public void triggerRcsReconfiguration() {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −3
Original line number Diff line number Diff line
@@ -2283,13 +2283,12 @@ interface ITelephony { 
    /**

     * Register RCS provisioning callback.

     */

    void registerRcsProvisioningChangedCallback(int subId,

            IRcsConfigCallback callback);

    void registerRcsProvisioningCallback(int subId, IRcsConfigCallback callback);



    /**

     * Unregister RCS provisioning callback.

     */

    void unregisterRcsProvisioningChangedCallback(int subId, IRcsConfigCallback callback);

    void unregisterRcsProvisioningCallback(int subId, IRcsConfigCallback callback);



    /**

     * trigger RCS reconfiguration.