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

Unverified Commit 13e194d3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Kevin F. Haggerty
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 d262fa6a)
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
parent 39bd18cf

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

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

    }



    private LockPatternUtils mLockPatternUtils;

    private StrongAuthTracker mStrongAuthTracker;



    public NotificationManagerService(Context context) {
@@ -2168,7 +2167,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 {
@@ -2654,7 +2652,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.