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

Commit 80573576 authored by Jack Yu's avatar Jack Yu
Browse files

Delayed registering as a system service 

Register the service after subscription database manager
is created.

Fix: 269089007
Test: v2/pixel-health-guard/device-boot-health-check-extra
Merged-In: I7db87800e2d9e1f78b0ede17d92b9197a2d319a2
Change-Id: I7db87800e2d9e1f78b0ede17d92b9197a2d319a2
parent 52579347

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

+8 −8
Original line number Diff line number Diff line
@@ -398,14 +398,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)) {
@@ -524,6 +516,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.