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

Commit 58ac838b authored by Jack Yu's avatar Jack Yu
Browse files

Throw illegal state exception when service is not available 

Bug: 239607619
Test: Build
Change-Id: I84b3f813e798707d5564b54b6b2cc329f570908d
parent 8a3803d4

telephony/java/android/telephony/SubscriptionManager.java

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

     *                 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

     *

     */

    @SystemApi

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

        try {

            ISub iSub = TelephonyManager.getSubscriptionService();

            if (iSub == null) return;

            if (iSub == null) {

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

            }



            ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {

                @Override
@@ -3071,7 +3074,8 @@ public class SubscriptionManager { 
            };

            iSub.setPreferredDataSubscriptionId(subId, needValidation, callbackStub);

        } catch (RemoteException ex) {

            // ignore it

            loge("setPreferredDataSubscriptionId RemoteException=" + ex);

            ex.rethrowFromSystemServer();

        }

    }