diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 372ad9da67e49..f9a9f240b82ed 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1189,7 +1189,7 @@ package android.hardware.display { public final class DisplayManager { method public boolean areUserDisabledHdrTypesAllowed(); - method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void clearUserPreferredDisplayMode(); + method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearUserPreferredDisplayMode(); method @NonNull public int[] getUserDisabledHdrTypes(); method @Nullable public android.view.Display.Mode getUserPreferredDisplayMode(); method public boolean isMinimalPostProcessingRequested(int); @@ -1197,7 +1197,7 @@ package android.hardware.display { method @RequiresPermission(android.Manifest.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE) public void setRefreshRateSwitchingType(int); method @RequiresPermission(android.Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS) public void setShouldAlwaysRespectAppRequestedMode(boolean); method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setUserDisabledHdrTypes(@NonNull int[]); - method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setUserPreferredDisplayMode(@NonNull android.view.Display.Mode); + method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void setUserPreferredDisplayMode(@NonNull android.view.Display.Mode); method @RequiresPermission(android.Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS) public boolean shouldAlwaysRespectAppRequestedMode(); field public static final int SWITCHING_TYPE_ACROSS_AND_WITHIN_GROUPS = 2; // 0x2 field public static final int SWITCHING_TYPE_NONE = 0; // 0x0 diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index c7f3983b87ff1..448188583b1ab 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -1119,7 +1119,7 @@ public final class DisplayManager { * @hide */ @TestApi - @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + @RequiresPermission(Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void setUserPreferredDisplayMode(@NonNull Display.Mode mode) { // Create a new object containing default values for the unused fields like mode ID and // alternative refresh rates. @@ -1134,7 +1134,7 @@ public final class DisplayManager { * @hide */ @TestApi - @RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS) + @RequiresPermission(Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearUserPreferredDisplayMode() { mGlobal.setUserPreferredDisplayMode(null); } diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl index b3be9da7c9770..0d5f1af727ae8 100644 --- a/core/java/android/hardware/display/IDisplayManager.aidl +++ b/core/java/android/hardware/display/IDisplayManager.aidl @@ -164,7 +164,7 @@ interface IDisplayManager { int getPreferredWideGamutColorSpaceId(); // Sets the user preferred display mode. - // Requires WRITE_SECURE_SETTINGS permission. + // Requires MODIFY_USER_PREFERRED_DISPLAY_MODE permission. void setUserPreferredDisplayMode(in Mode mode); Mode getUserPreferredDisplayMode(); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 5178f356b60d8..4386e3d6b5645 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -3151,7 +3151,7 @@ public final class DisplayManagerService extends SystemService { @Override // Binder call public void setUserPreferredDisplayMode(Display.Mode mode) { mContext.enforceCallingOrSelfPermission( - Manifest.permission.WRITE_SECURE_SETTINGS, + Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE, "Permission required to set the user preferred display mode."); final long token = Binder.clearCallingIdentity(); try {