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

Commit cd314a3a authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Throw illegal state exception when service is not available" am: 572a3587 am: f431f2ca 

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



Change-Id: Ib52218f59e3f5ca5075001e14ab568341925738a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd8608a7 f431f2ca

telephony/java/android/telephony/SubscriptionManager.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -3113,8 +3113,9 @@ public class SubscriptionManager { 
     * @param callback Callback will be triggered once it succeeds or failed.

     * @param callback Callback will be triggered once it succeeds or failed.

     *                 Pass null if don't care about the result.

     *                 Pass null if don't care about the result.

     *

     *

     * @throws IllegalStateException when subscription manager service is not available.

     * @throws SecurityException when clients do not have MODIFY_PHONE_STATE permission.

     * @hide

     * @hide

     *

     */

     */

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
@@ -3124,7 +3125,9 @@ public class SubscriptionManager { 
        if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);

        if (VDBG) logd("[setPreferredDataSubscriptionId]+ subId:" + subId);

        try {

        try {

            ISub iSub = TelephonyManager.getSubscriptionService();

            ISub iSub = TelephonyManager.getSubscriptionService();

            if (iSub == null) return;

            if (iSub == null) {

                throw new IllegalStateException("subscription manager service is null.");

            }





            ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {

            ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {

                @Override

                @Override
@@ -3144,7 +3147,8 @@ public class SubscriptionManager { 
            };

            };

            iSub.setPreferredDataSubscriptionId(subId, needValidation, callbackStub);

            iSub.setPreferredDataSubscriptionId(subId, needValidation, callbackStub);

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

            // ignore it

            loge("setPreferredDataSubscriptionId RemoteException=" + ex);

            ex.rethrowFromSystemServer();

        }

        }

    }

    }