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

Commit 12ea1a89 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33140168'] into 25Q2-release. 

Change-Id: I667898a56b609288d7778cec0dc8351889e10560
parents 08e0488e edcb16bd

src/com/android/settings/network/telephony/satellite/SatelliteSettingPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class SatelliteSettingPreferenceController extends 


    public SatelliteSettingPreferenceController(@NonNull Context context, @NonNull String key) {

        super(context, key);

        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);

    }



    /**
@@ -78,7 +79,6 @@ public class SatelliteSettingPreferenceController extends 
    public void initialize(int subId) {

        logd("initialize(), subId=" + subId);

        mSubId = subId;

        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);

        mSatelliteManager = mContext.getSystemService(SatelliteManager.class);

        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);

        if (mTelephonyManager != null) {

src/com/android/settings/network/telephony/satellite/SatelliteSettingsPreferenceCategoryController.java

+1 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class SatelliteSettingsPreferenceCategoryController extends 


    public SatelliteSettingsPreferenceCategoryController(Context context, String key) {

        super(context, key);

        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);

    }



    /**
@@ -74,7 +75,6 @@ public class SatelliteSettingsPreferenceCategoryController extends 
    public void init(int subId) {

        Log.d(TAG, "init(), subId=" + subId);

        mSubId = subId;

        mCarrierConfigCache = CarrierConfigCache.getInstance(mContext);

        mSatelliteManager = mContext.getSystemService(SatelliteManager.class);

        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);

        requestIsSatelliteSupported();