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

Commit 954eac51 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "not send illegalTelephonyStateException when sim is absent" 

am: 868a6dd3

Change-Id: I0ed1871b5ede3f13f87ff34f3a7a17a31b057bf4
parents 9760d385 868a6dd3

src/java/com/android/internal/telephony/SubscriptionController.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -2829,7 +2829,6 @@ public class SubscriptionController extends ISub.Stub { 
     * @throws SecurityException if the caller doesn't meet the requirements

     * @throws SecurityException if the caller doesn't meet the requirements

     *             outlined above.

     *             outlined above.

     * @throws IllegalArgumentException if the some subscriptions in the list doesn't exist.

     * @throws IllegalArgumentException if the some subscriptions in the list doesn't exist.

     * @throws IllegalStateException if Telephony service is in bad state.

     *

     *

     * @param subIdList list of subId that will be in the same group

     * @param subIdList list of subId that will be in the same group

     * @return groupUUID a UUID assigned to the subscription group. It returns

     * @return groupUUID a UUID assigned to the subscription group. It returns
@@ -3013,7 +3012,6 @@ public class SubscriptionController extends ISub.Stub { 
     *  the access rules we keep in our database for currently inactive eSIMs.

     *  the access rules we keep in our database for currently inactive eSIMs.

     *

     *

     * @throws IllegalArgumentException if the some subId is invalid or doesn't exist.

     * @throws IllegalArgumentException if the some subId is invalid or doesn't exist.

     * @throws IllegalStateException if Telephony is in bad state.

     *

     *

     *  @return true if checking passes on all subId, false otherwise.

     *  @return true if checking passes on all subId, false otherwise.

     */

     */
@@ -3040,10 +3038,6 @@ public class SubscriptionController extends ISub.Stub { 
        long identity = Binder.clearCallingIdentity();

        long identity = Binder.clearCallingIdentity();





        try {

        try {

            if (!isSubInfoReady()) {

                throw new IllegalStateException("Sub Controller not ready");

            }



            // Check access rules for each sub info.

            // Check access rules for each sub info.

            SubscriptionManager subscriptionManager = (SubscriptionManager)

            SubscriptionManager subscriptionManager = (SubscriptionManager)

                    mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);

                    mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);