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

Commit 5d1c1f0a authored by Julia Reynolds's avatar Julia Reynolds Committed by Android Build Coastguard Worker
Browse files

Move service initialization 

Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543)
(cherry picked from commit 7195bc016897dbc47bc93d86cc04eb5d1a9ee9a7)
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit bf382920dd0644496f2bb1142e71147fea01bafc)
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
parent 0ca41793

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −3
Original line number Diff line number Diff line
@@ -1940,7 +1940,6 @@ public class NotificationManagerService extends SystemService { 
        }

    }



    private LockPatternUtils mLockPatternUtils;

    private StrongAuthTracker mStrongAuthTracker;



    public NotificationManagerService(Context context) {
@@ -2157,7 +2156,6 @@ public class NotificationManagerService extends SystemService { 
                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));



        mUiHandler = new Handler(UiThread.get().getLooper());

        mLockPatternUtils = new LockPatternUtils(getContext());

        mStrongAuthTracker = new StrongAuthTracker(getContext());

        String[] extractorNames;

        try {
@@ -2634,7 +2632,7 @@ public class NotificationManagerService extends SystemService { 
                bubbsExtractor.setShortcutHelper(mShortcutHelper);

            }

            registerNotificationPreferencesPullers();

            mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);

            new LockPatternUtils(getContext()).registerStrongAuthTracker(mStrongAuthTracker);

        } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {

            // This observer will force an update when observe is called, causing us to

            // bind to listener services.