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

Commit 4fb8c2db authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use permission MODIFY_USER_PREFERRED_DISPLAY_MODE to set user preferred mode"

parents 1f245547 87eba5bd

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1198,7 +1198,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);
@@ -1206,7 +1206,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

core/java/android/hardware/display/DisplayManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }

core/java/android/hardware/display/IDisplayManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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();

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

+1 −1
Original line number Diff line number Diff line
@@ -3150,7 +3150,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 {