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

Commit 5b754d04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid flaky test fail due to no Subscription service." into main

parents ded1c459 27d2115e

src/com/android/settings/network/SubscriptionUtil.java

+7 −2
Original line number Diff line number Diff line
@@ -643,8 +643,13 @@ public class SubscriptionUtil { 


        final SubscriptionManager subscriptionManager = context.getSystemService(

                SubscriptionManager.class);

        String rawPhoneNumber = subscriptionManager.getPhoneNumber(

        String rawPhoneNumber = "";

        try {

            rawPhoneNumber = subscriptionManager.getPhoneNumber(

                    subscriptionInfo.getSubscriptionId());

        } catch (IllegalStateException e) {

            Log.e(TAG, "Subscription service unavailable : " + e);

        }

        if (TextUtils.isEmpty(rawPhoneNumber)) {

            return null;

        }