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

Commit 3f7f1acf authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Automerger Merge Worker
Browse files

Merge "DisplayModeDirector: move to dedicated package" into udc-dev am: 1279268a 

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



Change-Id: I1f6e280074dae117e721011e122db8dc4d1fceb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a29c4196 1279268a

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -85,6 +85,8 @@ import com.android.systemui.statusbar.VibratorHelper; 
import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.Execution;

import com.android.systemui.util.concurrency.Execution;





import kotlin.Unit;



import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -98,8 +100,6 @@ import java.util.Set; 
import javax.inject.Inject;

import javax.inject.Inject;

import javax.inject.Provider;

import javax.inject.Provider;





import kotlin.Unit;



/**

/**

 * Receives messages sent from {@link com.android.server.biometrics.BiometricService} and shows the

 * Receives messages sent from {@link com.android.server.biometrics.BiometricService} and shows the

 * appropriate biometric UI (e.g. BiometricDialogView).

 * appropriate biometric UI (e.g. BiometricDialogView).
@@ -872,7 +872,8 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks, 
    }

    }





    /**

    /**

     * Stores the callback received from {@link com.android.server.display.DisplayModeDirector}.

     * Stores the callback received from

     * {@link com.android.server.display.mode.DisplayModeDirector}.

     *

     *

     * DisplayModeDirector implements {@link IUdfpsRefreshRateRequestCallback}

     * DisplayModeDirector implements {@link IUdfpsRefreshRateRequestCallback}

     * and registers it with this class by calling

     * and registers it with this class by calling

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ import android.view.DisplayAddress; 
import android.view.Surface;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.SurfaceControl;





import com.android.server.display.mode.DisplayModeDirector;



import java.io.PrintWriter;

import java.io.PrintWriter;





/**

/**

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -1260,7 +1260,7 @@ public class DisplayDeviceConfig { 
        return mAmbientDarkeningPercentagesIdle;

        return mAmbientDarkeningPercentagesIdle;

    }

    }





    SensorData getAmbientLightSensor() {

    public SensorData getAmbientLightSensor() {

        return mAmbientLightSensor;

        return mAmbientLightSensor;

    }

    }
@@ -2821,7 +2821,7 @@ public class DisplayDeviceConfig { 
    /**

    /**

     * Uniquely identifies a Sensor, with the combination of Type and Name.

     * Uniquely identifies a Sensor, with the combination of Type and Name.

     */

     */

    static class SensorData {

    public static class SensorData {

        public String type;

        public String type;

        public String name;

        public String name;

        public float minRefreshRate = 0.0f;

        public float minRefreshRate = 0.0f;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,7 @@ import com.android.server.UiThread; 
import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

import com.android.server.display.DisplayDeviceConfig.SensorData;

import com.android.server.display.DisplayDeviceConfig.SensorData;

import com.android.server.display.layout.Layout;

import com.android.server.display.layout.Layout;

import com.android.server.display.mode.DisplayModeDirector;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.utils.SensorUtils;

import com.android.server.input.InputManagerInternal;

import com.android.server.input.InputManagerInternal;

import com.android.server.wm.SurfaceAnimationThread;

import com.android.server.wm.SurfaceAnimationThread;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.display.mode.DisplayModeDirector;

import com.android.server.lights.LightsManager;

import com.android.server.lights.LightsManager;

import com.android.server.lights.LogicalLight;

import com.android.server.lights.LogicalLight;