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

Commit ff9810b4 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on potentially missing CarrierConfigManager... 

Merge "Fix crash on potentially missing CarrierConfigManager [TelephonySubscriptionTracker]" into main
parents 6d1a6a97 333d996a

services/core/java/com/android/server/vcn/TelephonySubscriptionTracker.java

+9 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { 


    @NonNull private final TelephonyManager mTelephonyManager;

    @NonNull private final SubscriptionManager mSubscriptionManager;

    @NonNull private final CarrierConfigManager mCarrierConfigManager;

    @Nullable private final CarrierConfigManager mCarrierConfigManager;



    @NonNull private final ActiveDataSubscriptionIdListener mActiveDataSubIdListener;
@@ -158,8 +158,10 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { 
        mSubscriptionManager.addOnSubscriptionsChangedListener(

                executor, mSubscriptionChangedListener);

        mTelephonyManager.registerTelephonyCallback(executor, mActiveDataSubIdListener);

        if (mCarrierConfigManager != null) {

            mCarrierConfigManager.registerCarrierConfigChangeListener(executor,

                    mCarrierConfigChangeListener);

        }



        registerCarrierPrivilegesCallbacks();

    }
@@ -200,7 +202,10 @@ public class TelephonySubscriptionTracker extends BroadcastReceiver { 
        mContext.unregisterReceiver(this);

        mSubscriptionManager.removeOnSubscriptionsChangedListener(mSubscriptionChangedListener);

        mTelephonyManager.unregisterTelephonyCallback(mActiveDataSubIdListener);

        mCarrierConfigManager.unregisterCarrierConfigChangeListener(mCarrierConfigChangeListener);

        if (mCarrierConfigManager != null) {

            mCarrierConfigManager.unregisterCarrierConfigChangeListener(

                    mCarrierConfigChangeListener);

        }



        unregisterCarrierPrivilegesCallbacks();

    }