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

Commit bed32f6f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move service initialization" into tm-dev am: ac94a2da am: a6db0352... 

Merge "Move service initialization" into tm-dev am: ac94a2da am: a6db0352 am: 15eeeb07 am: 6d2a6fbc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18414748



Change-Id: I6e150c046558e00d804e29cd1409d5ac3891dd7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70596e4b 6d2a6fbc

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

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

    }













    private LockPatternUtils mLockPatternUtils;















    private StrongAuthTracker mStrongAuthTracker;





























    public NotificationManagerService(Context context) {










@@ -2211,7 +2210,6 @@ public class NotificationManagerService extends SystemService {













        mPlatformCompat = IPlatformCompat.Stub.asInterface(















                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));



























        mLockPatternUtils = new LockPatternUtils(getContext());















        mStrongAuthTracker = new StrongAuthTracker(getContext());















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















        String[] extractorNames;










@@ -2710,7 +2708,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.