diff options
6 files changed, 37 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index c821f699b8ec..16ea465027e6 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1120,6 +1120,7 @@ package android.hardware.display { method @RequiresPermission(android.Manifest.permission.BRIGHTNESS_SLIDER_USAGE) public java.util.List<android.hardware.display.BrightnessChangeEvent> getBrightnessEvents(); method @Nullable @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public android.hardware.display.BrightnessConfiguration getDefaultBrightnessConfiguration(); method public android.graphics.Point getStableDisplaySize(); + method public boolean isMinimalPostProcessingRequested(int); method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration); } diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index fb5f136f2fca..d67de09dd2a4 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -749,6 +749,17 @@ public final class DisplayManager { return mGlobal.getDefaultBrightnessConfiguration(); } + + /** + * Gets the last requested minimal post processing setting for the display with displayId. + * + * @hide + */ + @TestApi + public boolean isMinimalPostProcessingRequested(int displayId) { + return mGlobal.isMinimalPostProcessingRequested(displayId); + } + /** * Temporarily sets the brightness of the display. * <p> diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index 2a584951887f..fd539e8f1c91 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -594,6 +594,19 @@ public final class DisplayManagerGlobal { } /** + * Gets the last requested minimal post processing setting for the display with displayId. + * + * @hide + */ + public boolean isMinimalPostProcessingRequested(int displayId) { + try { + return mDm.isMinimalPostProcessingRequested(displayId); + } catch (RemoteException ex) { + throw ex.rethrowFromSystemServer(); + } + } + + /** * Temporarily sets the brightness of the display. * <p> * Requires the {@link android.Manifest.permission#CONTROL_DISPLAY_BRIGHTNESS} permission. diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl index 0143c9129b50..ccf221b693bc 100644 --- a/core/java/android/hardware/display/IDisplayManager.aidl +++ b/core/java/android/hardware/display/IDisplayManager.aidl @@ -111,6 +111,9 @@ interface IDisplayManager { // Gets the default brightness configuration if configured. BrightnessConfiguration getDefaultBrightnessConfiguration(); + // Gets the last requested minimal post processing settings for display with displayId. + boolean isMinimalPostProcessingRequested(int displayId); + // Temporarily sets the display brightness. void setTemporaryBrightness(int brightness); diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index 7d455c93729c..b9868a7e1444 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -624,6 +624,8 @@ public final class DisplayInfo implements Parcelable { sb.append(Arrays.toString(supportedColorModes)); sb.append(", hdrCapabilities "); sb.append(hdrCapabilities); + sb.append(", minimalPostProcessingSupported "); + sb.append(minimalPostProcessingSupported); sb.append(", rotation "); sb.append(rotation); sb.append(", density "); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index e39d6d5389e3..58e519d1f595 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -2244,6 +2244,13 @@ public final class DisplayManagerService extends SystemService { } @Override // Binder call + public boolean isMinimalPostProcessingRequested(int displayId) { + synchronized (mSyncRoot) { + return mLogicalDisplays.get(displayId).getRequestedMinimalPostProcessingLocked(); + } + } + + @Override // Binder call public void setTemporaryBrightness(int brightness) { mContext.enforceCallingOrSelfPermission( Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS, |