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

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

Merge "Do not crash clients when service is not available" into udc-dev am: 5434a53c 

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



Change-Id: Ib1768abaa49f6c3a11c21525528e6195e364a6f8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ef25ad1 5434a53c

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();