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

Commit fcf7f7b6 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "Making BrightnessSynchronizer operate on Display thread" into main

parents ba1079c8 b1065413

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

+3 −3
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ public class BrightnessSynchronizer { 
    // Feature flag that will eventually be removed

    private final boolean mIntRangeUserPerceptionEnabled;



    public BrightnessSynchronizer(Context context, boolean intRangeUserPerceptionEnabled) {

        this(context, Looper.getMainLooper(), SystemClock::uptimeMillis,

                intRangeUserPerceptionEnabled);

    public BrightnessSynchronizer(Context context, Looper looper,

            boolean intRangeUserPerceptionEnabled) {

        this(context, looper, SystemClock::uptimeMillis, intRangeUserPerceptionEnabled);

    }



    @VisibleForTesting

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -598,10 +598,11 @@ public final class DisplayManagerService extends SystemService { 
        FoldSettingProvider foldSettingProvider = new FoldSettingProvider(context,

                new SettingsWrapper(),

                new FoldLockSettingAvailabilityProvider(context.getResources()));

        Looper displayThreadLooper = DisplayThread.get().getLooper();

        mInjector = injector;

        mContext = context;

        mFlags = injector.getFlags();

        mHandler = new DisplayManagerHandler(DisplayThread.get().getLooper());

        mHandler = new DisplayManagerHandler(displayThreadLooper);

        mUiHandler = UiThread.getHandler();

        mDisplayDeviceRepo = new DisplayDeviceRepository(mSyncRoot, mPersistentDataStore);

        mLogicalDisplayMapper = new LogicalDisplayMapper(mContext,
@@ -609,7 +610,7 @@ public final class DisplayManagerService extends SystemService { 
                mDisplayDeviceRepo, new LogicalDisplayListener(), mSyncRoot, mHandler, mFlags);

        mDisplayModeDirector = new DisplayModeDirector(

                context, mHandler, mFlags, mDisplayDeviceConfigProvider);

        mBrightnessSynchronizer = new BrightnessSynchronizer(mContext,

        mBrightnessSynchronizer = new BrightnessSynchronizer(mContext, displayThreadLooper,

                mFlags.isBrightnessIntRangeUserPerceptionEnabled());

        Resources resources = mContext.getResources();

        mDefaultDisplayDefaultColorMode = mContext.getResources().getInteger(