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

Commit ff94846d authored by fionaxu's avatar fionaxu
Browse files

Don't throw exception if phone process is dead for carrier ID APIs 

Bug: 73772776
Test: Build
Change-Id: I81638f52d5d8ccf1005878ba4f3967e07169284b
(cherry picked from commit 331965e5)
Merged-in: I81638f52d5d8ccf1005878ba4f3967e07169284b
parent fdebcf1a

telephony/java/android/telephony/TelephonyManager.java

+6 −10
Original line number Diff line number Diff line
@@ -6968,18 +6968,16 @@ public class TelephonyManager { 
     *

     * @return Carrier id of the current subscription. Return {@link #UNKNOWN_CARRIER_ID} if the

     * subscription is unavailable or the carrier cannot be identified.

     * @throws IllegalStateException if telephony service is unavailable.

     */

    public int getAndroidCarrierIdForSubscription() {

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.getSubscriptionCarrierId(getSubId());

            }

        } catch (RemoteException ex) {

            // This could happen if binder process crashes.

            ex.rethrowAsRuntimeException();

        } catch (NullPointerException ex) {

            // This could happen before phone restarts due to crashing.

            throw new IllegalStateException("Telephony service unavailable");

        }

        return UNKNOWN_CARRIER_ID;

    }
@@ -6995,18 +6993,16 @@ public class TelephonyManager { 
     *

     * @return Carrier name of the current subscription. Return {@code null} if the subscription is

     * unavailable or the carrier cannot be identified.

     * @throws IllegalStateException if telephony service is unavailable.

     */

    public CharSequence getAndroidCarrierNameForSubscription() {

        try {

            ITelephony service = getITelephony();

            if (service != null) {

                return service.getSubscriptionCarrierName(getSubId());

            }

        } catch (RemoteException ex) {

            // This could happen if binder process crashes.

            ex.rethrowAsRuntimeException();

        } catch (NullPointerException ex) {

            // This could happen before phone restarts due to crashing.

            throw new IllegalStateException("Telephony service unavailable");

        }

        return null;

    }