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

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

Change-Id: I3d4aa2799cf1d8737f0058cc40f9ee24953b1dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Philip Junker
2022-10-10 16:41:36 +00:00
committed by Automerger Merge Worker

View File

@@ -115,7 +115,7 @@ public class BrightnessSynchronizer {
Slog.i(TAG, "Setting initial brightness to default value of: " + defaultBrightness); Slog.i(TAG, "Setting initial brightness to default value of: " + defaultBrightness);
} }
mBrightnessSyncObserver.startObserving(); mBrightnessSyncObserver.startObserving(mHandler);
mHandler.sendEmptyMessageAtTime(MSG_RUN_UPDATE, mClock.uptimeMillis()); mHandler.sendEmptyMessageAtTime(MSG_RUN_UPDATE, mClock.uptimeMillis());
} }
@@ -482,27 +482,29 @@ public class BrightnessSynchronizer {
} }
}; };
private final ContentObserver mContentObserver = new ContentObserver(mHandler) { private ContentObserver createBrightnessContentObserver(Handler handler) {
@Override return new ContentObserver(handler) {
public void onChange(boolean selfChange, Uri uri) { @Override
if (selfChange) { public void onChange(boolean selfChange, Uri uri) {
return; if (selfChange) {
return;
}
if (BRIGHTNESS_URI.equals(uri)) {
handleBrightnessChangeInt(getScreenBrightnessInt());
}
} }
if (BRIGHTNESS_URI.equals(uri)) { };
handleBrightnessChangeInt(getScreenBrightnessInt()); }
}
}
};
boolean isObserving() { boolean isObserving() {
return mIsObserving; return mIsObserving;
} }
void startObserving() { void startObserving(Handler handler) {
final ContentResolver cr = mContext.getContentResolver(); final ContentResolver cr = mContext.getContentResolver();
cr.registerContentObserver(BRIGHTNESS_URI, false, mContentObserver, cr.registerContentObserver(BRIGHTNESS_URI, false,
UserHandle.USER_ALL); createBrightnessContentObserver(handler), UserHandle.USER_ALL);
mDisplayManager.registerDisplayListener(mListener, mHandler, mDisplayManager.registerDisplayListener(mListener, handler,
DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS); DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS);
mIsObserving = true; mIsObserving = true;
} }