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

Commit 15ce2df4 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Delayed registering as a system service"

parents 18d20ba9 068f6171

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+8 −8
Original line number Diff line number Diff line
@@ -404,14 +404,6 @@ public class SubscriptionManagerService extends ISub.Stub { 


        mBackgroundHandler = new Handler(backgroundThread.getLooper());



        TelephonyServiceManager.ServiceRegisterer subscriptionServiceRegisterer =

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getSubscriptionServiceRegisterer();

        if (subscriptionServiceRegisterer.get() == null) {

            subscriptionServiceRegisterer.register(this);

        }



        mDefaultVoiceSubId = new WatchedInt(Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION,

                SubscriptionManager.INVALID_SUBSCRIPTION_ID)) {
@@ -539,6 +531,14 @@ public class SubscriptionManagerService extends ISub.Stub { 


        updateDefaultSubId();



        TelephonyServiceManager.ServiceRegisterer subscriptionServiceRegisterer =

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()

                        .getSubscriptionServiceRegisterer();

        if (subscriptionServiceRegisterer.get() == null) {

            subscriptionServiceRegisterer.register(this);

        }



        mHandler.post(() -> {

            // EuiccController is created after SubscriptionManagerService. So we need to get

            // the instance later in the handler.