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

Commit f16a5ff8 authored by Philip Junker's avatar Philip Junker Committed by Automerger Merge Worker
Browse files

Merge "Initialize ContentObserver in startObserving()." am: f8a71a55 

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



Change-Id: I3d4aa2799cf1d8737f0058cc40f9ee24953b1dc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a2f2acf f8a71a55

core/java/com/android/internal/display/BrightnessSynchronizer.java

+17 −15
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class BrightnessSynchronizer { 
            Slog.i(TAG, "Setting initial brightness to default value of: " + defaultBrightness);

        }



        mBrightnessSyncObserver.startObserving();

        mBrightnessSyncObserver.startObserving(mHandler);

        mHandler.sendEmptyMessageAtTime(MSG_RUN_UPDATE, mClock.uptimeMillis());

    }
@@ -482,7 +482,8 @@ public class BrightnessSynchronizer { 
            }

        };



        private final ContentObserver mContentObserver = new ContentObserver(mHandler) {

        private ContentObserver createBrightnessContentObserver(Handler handler) {

            return new ContentObserver(handler) {

                @Override

                public void onChange(boolean selfChange, Uri uri) {

                    if (selfChange) {
@@ -493,16 +494,17 @@ public class BrightnessSynchronizer { 
                    }

                }

            };

        }



        boolean isObserving() {

            return mIsObserving;

        }



        void startObserving() {

        void startObserving(Handler handler) {

            final ContentResolver cr = mContext.getContentResolver();

            cr.registerContentObserver(BRIGHTNESS_URI, false, mContentObserver,

                    UserHandle.USER_ALL);

            mDisplayManager.registerDisplayListener(mListener, mHandler,

            cr.registerContentObserver(BRIGHTNESS_URI, false,

                    createBrightnessContentObserver(handler), UserHandle.USER_ALL);

            mDisplayManager.registerDisplayListener(mListener, handler,

                    DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);

            mIsObserving = true;

        }