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

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

Merge "Initialize content resolver in ctor" into sc-v2-dev am: c07b6d26 

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

Change-Id: I86feb78d8d27d9789ba7f15d4d87b7b6e2b7a0b7
parents 32e39347 c07b6d26

packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,6 +109,7 @@ public final class NavBarHelper implements 
            UserTracker userTracker,

            UserTracker userTracker,

            DumpManager dumpManager) {

            DumpManager dumpManager) {

        mContext = context;

        mContext = context;

        mContentResolver = mContext.getContentResolver();

        mAccessibilityManager = accessibilityManager;

        mAccessibilityManager = accessibilityManager;

        mAssistManagerLazy = assistManagerLazy;

        mAssistManagerLazy = assistManagerLazy;

        mStatusBarOptionalLazy = statusBarOptionalLazy;

        mStatusBarOptionalLazy = statusBarOptionalLazy;
@@ -124,7 +125,6 @@ public final class NavBarHelper implements 
    }

    }





    public void init() {

    public void init() {

        mContentResolver = mContext.getContentResolver();

        mContentResolver.registerContentObserver(

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSISTANT),

                Settings.Secure.getUriFor(Settings.Secure.ASSISTANT),

                false /* notifyForDescendants */, mAssistContentObserver, UserHandle.USER_ALL);

                false /* notifyForDescendants */, mAssistContentObserver, UserHandle.USER_ALL);