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

Commit ad70b911 authored by Jack Yu's avatar Jack Yu
Browse files

Do not crash clients when service is not available 

To be consistent with many other subscription manager APIs.

Fix: 270558438
Test: Basic phone funcationality tests
Change-Id: Iae8806084193c6686a1b8ce8376f43b5f5dddce1
parent 33504f63

telephony/java/android/telephony/SubscriptionManager.java

+1 −3
Original line number Diff line number Diff line
@@ -4401,7 +4401,6 @@ public class SubscriptionManager { 
     *

     * @throws IllegalArgumentException if subscription is invalid.

     * @throws SecurityException if the caller doesn't have permissions required.

     * @throws IllegalStateException if subscription service is not available.

     *

     * @hide

     */
@@ -4418,8 +4417,7 @@ public class SubscriptionManager { 
            if (iSub != null) {

                return iSub.getSubscriptionUserHandle(subscriptionId);

            } else {

                throw new IllegalStateException("[getSubscriptionUserHandle]: "

                        + "subscription service unavailable");

                Log.e(LOG_TAG, "[getSubscriptionUserHandle]: subscription service unavailable");

            }

        } catch (RemoteException ex) {

            ex.rethrowAsRuntimeException();