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

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

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

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



Change-Id: I7ea267bf9be266ca8d236dbe9a5d3c84488a730b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb9d40ef ac94a2da

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

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

        }

    }

    }

















    private LockPatternUtils mLockPatternUtils;














    private StrongAuthTracker mStrongAuthTracker;







    private StrongAuthTracker mStrongAuthTracker;



























    public NotificationManagerService(Context context) {







    public NotificationManagerService(Context context) {










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









        mPlatformCompat = IPlatformCompat.Stub.asInterface(







        mPlatformCompat = IPlatformCompat.Stub.asInterface(











                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));







                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));



























        mLockPatternUtils = new LockPatternUtils(getContext());














        mStrongAuthTracker = new StrongAuthTracker(getContext());







        mStrongAuthTracker = new StrongAuthTracker(getContext());











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







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











        String[] extractorNames;







        String[] extractorNames;










@@ -2709,7 +2707,7 @@ public class NotificationManagerService extends SystemService {









                bubbsExtractor.setShortcutHelper(mShortcutHelper);







                bubbsExtractor.setShortcutHelper(mShortcutHelper);











            }







            }











            registerNotificationPreferencesPullers();







            registerNotificationPreferencesPullers();











            mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);







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











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







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











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







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











            // bind to listener services.







            // bind to listener services.