Revert "Provide the current auto-brightness levels in DisplayOffloadSession"

This reverts commit 32fba93bedfff72c826a896bdd95014d23278082.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=husky-trunk_staging-userdebug&lkgb=11241730&lkbb=11242061&fkbb=11241746>, bug b
/317228662

BUG: b/317228662

Change-Id: Ic793e03acd2beb54199ec4813a116df5f3aeb80f

8 files changed, 22 insertions, 77 deletions

diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java
index 86024ea41363..ffd7212a7525 100644
--- a/core/java/android/hardware/display/DisplayManagerInternal.java
+++ b/core/java/android/hardware/display/DisplayManagerInternal.java
@@ -751,13 +751,6 @@ public abstract class DisplayManagerInternal {
          */
         boolean blockScreenOn(Runnable unblocker);
 
-        /** Get the current brightness levels used to determine automatic brightness based on lux
-         * levels. */
-        float[] getCurrentAutoBrightnessLevels();
-
-        /** Get the current lux levels used to determine automatic brightness. */
-        float[] getCurrentAutoBrightnessLuxLevels();
-
         /** Returns whether displayoffload supports the given display state. */
         static boolean isSupportedOffloadState(int displayState) {
             return Display.isSuspendedState(displayState);
diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 2d6177d9d27b..3024dd27b5c4 100644
--- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@ -403,8 +403,7 @@ public class AutomaticBrightnessController {
                     | (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0)
                     | (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE
                         ? BrightnessEvent.FLAG_DOZE_SCALE : 0)
-                    | (getMode() == AUTO_BRIGHTNESS_MODE_IDLE
-                        ? BrightnessEvent.FLAG_IDLE_CURVE : 0));
+                    | (isInIdleMode() ? BrightnessEvent.FLAG_IDLE_CURVE : 0));
         }
 
         if (!mAmbientLuxValid) {
@@ -515,8 +514,7 @@ public class AutomaticBrightnessController {
         if (mLoggingEnabled) {
             Slog.d(TAG, "Display policy transitioning from " + oldPolicy + " to " + policy);
         }
-        if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy)
-                && getMode() != AUTO_BRIGHTNESS_MODE_IDLE) {
+        if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy) && !isInIdleMode()) {
             mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL,
                     mCurrentBrightnessMapper.getShortTermModelTimeout());
         } else if (isInteractivePolicy(policy) && !isInteractivePolicy(oldPolicy)) {
@@ -557,7 +555,7 @@ public class AutomaticBrightnessController {
             boolean shouldResetShortTermModel) {
         if (mBrightnessMappingStrategyMap.get(AUTO_BRIGHTNESS_MODE_DEFAULT)
                 .setBrightnessConfiguration(configuration)) {
-            if (getMode() != AUTO_BRIGHTNESS_MODE_IDLE && shouldResetShortTermModel) {
+            if (!isInIdleMode() && shouldResetShortTermModel) {
                 resetShortTermModel();
             }
             return true;
@@ -565,9 +563,8 @@ public class AutomaticBrightnessController {
         return false;
     }
 
-    @AutomaticBrightnessController.AutomaticBrightnessMode
-    public int getMode() {
-        return mCurrentBrightnessMapper.getMode();
+    public boolean isInIdleMode() {
+        return mCurrentBrightnessMapper.getMode() == AUTO_BRIGHTNESS_MODE_IDLE;
     }
 
     public void dump(PrintWriter pw) {
@@ -623,7 +620,8 @@ public class AutomaticBrightnessController {
         pw.println("  mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName);
         pw.println("  mForegroundAppCategory=" + mForegroundAppCategory);
         pw.println("  mPendingForegroundAppCategory=" + mPendingForegroundAppCategory);
-        pw.println("  Current mode=" + autoBrightnessModeToString(getMode()));
+        pw.println("  Current mode="
+                + autoBrightnessModeToString(mCurrentBrightnessMapper.getMode()));
 
         pw.println();
         for (int i = 0; i < mBrightnessMappingStrategyMap.size(); i++) {
@@ -745,7 +743,7 @@ public class AutomaticBrightnessController {
             lux = 0;
         }
         mAmbientLux = lux;
-        if (getMode() == AUTO_BRIGHTNESS_MODE_IDLE) {
+        if (isInIdleMode()) {
             mAmbientBrighteningThreshold =
                     mAmbientBrightnessThresholdsIdle.getBrighteningThreshold(lux);
             mAmbientDarkeningThreshold =
@@ -837,7 +835,7 @@ public class AutomaticBrightnessController {
             }
             earliestValidTime = mAmbientLightRingBuffer.getTime(i);
         }
-        return earliestValidTime + (getMode() == AUTO_BRIGHTNESS_MODE_IDLE
+        return earliestValidTime + (isInIdleMode()
                 ? mBrighteningLightDebounceConfigIdle : mBrighteningLightDebounceConfig);
     }
 
@@ -850,7 +848,7 @@ public class AutomaticBrightnessController {
             }
             earliestValidTime = mAmbientLightRingBuffer.getTime(i);
         }
-        return earliestValidTime + (getMode() == AUTO_BRIGHTNESS_MODE_IDLE
+        return earliestValidTime + (isInIdleMode()
                 ? mDarkeningLightDebounceConfigIdle : mDarkeningLightDebounceConfig);
     }
 
@@ -975,7 +973,7 @@ public class AutomaticBrightnessController {
                 mPreThresholdBrightness = mScreenAutoBrightness;
             }
             mScreenAutoBrightness = newScreenAutoBrightness;
-            if (getMode() == AUTO_BRIGHTNESS_MODE_IDLE) {
+            if (isInIdleMode()) {
                 mScreenBrighteningThreshold = clampScreenBrightness(
                         mScreenBrightnessThresholdsIdle.getBrighteningThreshold(
                                 newScreenAutoBrightness));
diff --git a/services/core/java/com/android/server/display/DisplayOffloadSessionImpl.java b/services/core/java/com/android/server/display/DisplayOffloadSessionImpl.java
index c17709144e1d..4e341a9c19b4 100644
--- a/services/core/java/com/android/server/display/DisplayOffloadSessionImpl.java
+++ b/services/core/java/com/android/server/display/DisplayOffloadSessionImpl.java
@@ -65,16 +65,6 @@ public class DisplayOffloadSessionImpl implements DisplayManagerInternal.Display
         return true;
     }
 
-    @Override
-    public float[] getCurrentAutoBrightnessLevels() {
-        return mDisplayPowerController.getCurrentAutoBrightnessLevels();
-    }
-
-    @Override
-    public float[] getCurrentAutoBrightnessLuxLevels() {
-        return mDisplayPowerController.getCurrentAutoBrightnessLuxLevels();
-    }
-
     /**
      * Start the offload session. The method returns if the session is already active.
      * @return Whether the session was started successfully
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index c17378d790bd..06e5f99a1946 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1119,7 +1119,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                 DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,
                 DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);
         setAnimatorRampSpeeds(mAutomaticBrightnessController != null
-                && mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE);
+                && mAutomaticBrightnessController.isInIdleMode());
         mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);
 
         noteScreenState(mPowerState.getScreenState());
@@ -1990,8 +1990,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                     boolean isIncreasing = animateValue > currentBrightness;
                     final float rampSpeed;
                     final boolean idle = mAutomaticBrightnessController != null
-                            && mAutomaticBrightnessController.getMode()
-                            == AUTO_BRIGHTNESS_MODE_IDLE;
+                            && mAutomaticBrightnessController.isInIdleMode();
                     if (isIncreasing && slowChange) {
                         rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle
                                 : mBrightnessRampRateSlowIncrease;
@@ -2215,18 +2214,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
     }
 
     @Override
-    public float[] getCurrentAutoBrightnessLevels() {
-        // The old DPC is no longer supported
-        return new float[0];
-    }
-
-    @Override
-    public float[] getCurrentAutoBrightnessLuxLevels() {
-        // The old DPC is no longer supported
-        return new float[0];
-    }
-
-    @Override
     public BrightnessInfo getBrightnessInfo() {
         synchronized (mCachedBrightnessInfo) {
             return new BrightnessInfo(
@@ -2911,7 +2898,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         // or the nits is invalid.
         if (brightnessIsTemporary
                 || mAutomaticBrightnessController == null
-                || mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE
+                || mAutomaticBrightnessController.isInIdleMode()
                 || !autobrightnessEnabled
                 || mBrightnessTracker == null
                 || !mUseAutoBrightness
diff --git a/services/core/java/com/android/server/display/DisplayPowerController2.java b/services/core/java/com/android/server/display/DisplayPowerController2.java
index 2efda087d4ac..519224a5fcff 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController2.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController2.java
@@ -951,7 +951,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
                 DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,
                 DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);
         setAnimatorRampSpeeds(mAutomaticBrightnessController != null
-                && mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE);
+                && mAutomaticBrightnessController.isInIdleMode());
         mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);
 
         noteScreenState(mPowerState.getScreenState());
@@ -1365,7 +1365,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
 
         // Switch to doze auto-brightness mode if needed
         if (mFlags.areAutoBrightnessModesEnabled() && mAutomaticBrightnessController != null
-                && mAutomaticBrightnessController.getMode() != AUTO_BRIGHTNESS_MODE_IDLE) {
+                && !mAutomaticBrightnessController.isInIdleMode()) {
             setAutomaticScreenBrightnessMode(Display.isDozeState(state)
                     ? AUTO_BRIGHTNESS_MODE_DOZE : AUTO_BRIGHTNESS_MODE_DEFAULT);
         }
@@ -1654,8 +1654,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
                     boolean isIncreasing = animateValue > currentBrightness;
                     final float rampSpeed;
                     final boolean idle = mAutomaticBrightnessController != null
-                            && mAutomaticBrightnessController.getMode()
-                            == AUTO_BRIGHTNESS_MODE_IDLE;
+                            && mAutomaticBrightnessController.isInIdleMode();
                     if (isIncreasing && slowChange) {
                         rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle
                                 : mBrightnessRampRateSlowIncrease;
@@ -1887,18 +1886,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
     }
 
     @Override
-    public float[] getCurrentAutoBrightnessLevels() {
-        return mDisplayDeviceConfig.getAutoBrightnessBrighteningLevels(
-                mAutomaticBrightnessController.getMode());
-    }
-
-    @Override
-    public float[] getCurrentAutoBrightnessLuxLevels() {
-        return mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux(
-                mAutomaticBrightnessController.getMode());
-    }
-
-    @Override
     public BrightnessInfo getBrightnessInfo() {
         synchronized (mCachedBrightnessInfo) {
             return new BrightnessInfo(
@@ -2473,7 +2460,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
         // or the nits is invalid.
         if (brightnessIsTemporary
                 || mAutomaticBrightnessController == null
-                || mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE
+                || mAutomaticBrightnessController.isInIdleMode()
                 || !autobrightnessEnabled
                 || mBrightnessTracker == null
                 || !shouldUseAutoBrightness
diff --git a/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java b/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java
index 5b350db5fa7b..c27918430254 100644
--- a/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java
+++ b/services/core/java/com/android/server/display/DisplayPowerControllerInterface.java
@@ -237,14 +237,4 @@ public interface DisplayPowerControllerInterface {
      * Indicate that boot has been completed and the screen is ready to update.
      */
     void onBootCompleted();
-
-    /**
-     * Get the current brightness levels used to determine automatic brightness based on lux levels.
-     */
-    float[] getCurrentAutoBrightnessLevels();
-
-    /**
-     * Get the current lux levels used to determine automatic brightness.
-     */
-    float[] getCurrentAutoBrightnessLuxLevels();
 }
diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
index 7a708487293e..4cc68cf11e69 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
@@ -775,7 +775,7 @@ public final class DisplayPowerController2Test {
         final float hdrBrightness = 0.3f;
         when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON);
         when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f);
-        when(mHolder.automaticBrightnessController.getMode()).thenReturn(AUTO_BRIGHTNESS_MODE_IDLE);
+        when(mHolder.automaticBrightnessController.isInIdleMode()).thenReturn(true);
         when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness(
                 any(BrightnessEvent.class))).thenReturn(sdrBrightness);
         when(mHolder.hdrClamper.getMaxBrightness()).thenReturn(1.0f);
@@ -1234,7 +1234,7 @@ public final class DisplayPowerController2Test {
         float brightness = 0.6f;
         when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON);
         when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f);
-        when(mHolder.automaticBrightnessController.getMode()).thenReturn(AUTO_BRIGHTNESS_MODE_IDLE);
+        when(mHolder.automaticBrightnessController.isInIdleMode()).thenReturn(true);
         when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness(
                 any(BrightnessEvent.class))).thenReturn(brightness);
 
@@ -1597,7 +1597,7 @@ public final class DisplayPowerController2Test {
     public void testDoesNotSwitchFromIdleToDozeAutoBrightnessMode() {
         when(mDisplayManagerFlagsMock.areAutoBrightnessModesEnabled()).thenReturn(true);
         when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_DOZE);
-        when(mHolder.automaticBrightnessController.getMode()).thenReturn(AUTO_BRIGHTNESS_MODE_IDLE);
+        when(mHolder.automaticBrightnessController.isInIdleMode()).thenReturn(true);
 
         DisplayPowerRequest dpr = new DisplayPowerRequest();
         mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);
diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
index d69c140716f3..943862f918bc 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
@@ -1164,7 +1164,7 @@ public final class DisplayPowerControllerTest {
         float brightness = 0.6f;
         when(mHolder.displayPowerState.getScreenState()).thenReturn(Display.STATE_ON);
         when(mHolder.displayPowerState.getColorFadeLevel()).thenReturn(1.0f);
-        when(mHolder.automaticBrightnessController.getMode()).thenReturn(AUTO_BRIGHTNESS_MODE_IDLE);
+        when(mHolder.automaticBrightnessController.isInIdleMode()).thenReturn(true);
         when(mHolder.automaticBrightnessController.getAutomaticScreenBrightness(
                 any(BrightnessEvent.class))).thenReturn(brightness);