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

Commit dfcf68bc authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Introducing DisplayPowerProximityStateController"

parents bc591c28 c9aa9611

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

+48 −321

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+476 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java

+11 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.hardware.SensorManager; 
import android.hardware.display.DisplayManagerInternal.DisplayPowerCallbacks;

import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest;

import android.os.Handler;

import android.os.Looper;

import android.os.PowerManager;

import android.os.test.TestLooper;

import android.util.FloatProperty;
@@ -135,6 +136,16 @@ public final class DisplayPowerController2Test { 
                    DisplayPowerCallbacks displayPowerCallbacks) {

                return mWakelockController;

            }



            @Override

            DisplayPowerProximityStateController getDisplayPowerProximityStateController(

                    WakelockController wakelockController, DisplayDeviceConfig displayDeviceConfig,

                    Looper looper, Runnable nudgeUpdatePowerState, int displayId,

                    SensorManager sensorManager) {

                return new DisplayPowerProximityStateController(wakelockController,

                        displayDeviceConfig, looper, nudgeUpdatePowerState, displayId,

                        sensorManager);

            }

        };



        addLocalServiceMock(WindowManagerPolicy.class, mWindowManagerPolicyMock);