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

Commit 4707f8ce authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-20813798-smsvc_bootup-BEFGVMIOWJ" 

* changes:
  Revert "Moved SIM state broadcast back to UiccController"
  Revert "Added SIM events handling and fix crashes"
parents 28038a6d a26d3ea0

src/java/com/android/internal/telephony/CarrierServiceBindHelper.java

+1 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -201,13 +200,7 @@ public class CarrierServiceBindHelper { 
        }

    }



    /**

     * Update SIM state.

     *

     * @param phoneId The phone id.

     * @param simState The legacy SIM state.

     */

    public void updateSimState(int phoneId, @NonNull String simState) {

    void updateForPhoneId(int phoneId, String simState) {

        logdWithLocalLog("update binding for phoneId: " + phoneId + " simState: " + simState);

        if (!SubscriptionManager.isValidPhoneId(phoneId)) {

            return;

src/java/com/android/internal/telephony/PhoneFactory.java

+2 −7
Original line number Diff line number Diff line
@@ -214,14 +214,9 @@ public class PhoneFactory { 
                    TelephonyComponentFactory.getInstance().inject(SubscriptionController.class

                            .getName()).initSubscriptionController(context);

                }



                SubscriptionController sc = null;

                if (!isSubscriptionManagerServiceEnabled()) {

                    sc = SubscriptionController.getInstance();

                }



                TelephonyComponentFactory.getInstance().inject(MultiSimSettingController.class.

                        getName()).initMultiSimSettingController(context, sc);

                        getName()).initMultiSimSettingController(context,

                        SubscriptionController.getInstance());



                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_TELEPHONY_EUICC)) {

src/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -2751,8 +2751,8 @@ public class ServiceStateTracker extends Handler { 


            if (mPhone.isSubscriptionManagerServiceEnabled()) {

                mSubscriptionManagerService.setCarrierName(mPhone.getSubId(),

                        TextUtils.emptyIfNull(getCarrierName(data.shouldShowPlmn(), data.getPlmn(),

                                data.shouldShowSpn(), data.getSpn())));

                        getCarrierName(data.shouldShowPlmn(), data.getPlmn(),

                                data.shouldShowSpn(), data.getSpn()));

            } else {

                if (!mSubscriptionController.setPlmnSpn(mPhone.getPhoneId(),

                        data.shouldShowPlmn(), data.getPlmn(), data.shouldShowSpn(),

src/java/com/android/internal/telephony/SubscriptionController.java

+1 −4
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ public class SubscriptionController extends ISub.Stub { 


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static SubscriptionController getInstance() {

        if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {

            throw new RuntimeException("getInstance should not be called.");

        }

        if (sInstance == null) {

           Log.wtf(LOG_TAG, "getInstance null");

        }

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ public class SubscriptionInfoUpdater extends Handler { 
        CarrierConfigManager configManager =

                (CarrierConfigManager) sContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        configManager.updateConfigForPhoneId(phoneId, simState);

        mCarrierServiceBindHelper.updateSimState(phoneId, simState);

        mCarrierServiceBindHelper.updateForPhoneId(phoneId, simState);

    }



    private void updateSubscriptionCarrierId(int phoneId, String simState) {