Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use permission MODIFY_USER_PREFERRED_DISPLAY_MODE to set user preferred

Browse Source 
mode

Bug: 198452789
Test: atest DefaultDisplayModeTest
Change-Id: Ib362dfa3174f42d20da7a249d560cae4e93318c2
This commit is contained in:
Kriti Dang
2021-10-19 15:02:11 +02:00
parent ef86923d5d
commit 87eba5bd4c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/test-current.txt
View File

@@ -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

4
core/java/android/hardware/display/DisplayManager.java
View File

@@ -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);
}

2
core/java/android/hardware/display/IDisplayManager.aidl
View File

@@ -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();

2
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -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 {