Merge "Unify DisplayManagerService permission checks" into main (5347604f) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -56,15 +56,18 @@ interface IDisplayManager {
		void stopWifiDisplayScan();

		// Requires CONFIGURE_WIFI_DISPLAY permission.
		@EnforcePermission("CONFIGURE_WIFI_DISPLAY")
		void connectWifiDisplay(String address);

		// No permissions required.
		void disconnectWifiDisplay();

		// Requires CONFIGURE_WIFI_DISPLAY permission.
		@EnforcePermission("CONFIGURE_WIFI_DISPLAY")
		void renameWifiDisplay(String address, String alias);

		// Requires CONFIGURE_WIFI_DISPLAY permission.
		@EnforcePermission("CONFIGURE_WIFI_DISPLAY")
		void forgetWifiDisplay(String address);

		// Requires CONFIGURE_WIFI_DISPLAY permission.
		@@ -169,6 +172,7 @@ interface IDisplayManager {
		void setBrightness(int displayId, float brightness);

		// Retrieves the display brightness.
		@EnforcePermission("CONTROL_DISPLAY_BRIGHTNESS")
		float getBrightness(int displayId);

		// Temporarily sets the auto brightness adjustment factor.
		@@ -196,8 +200,7 @@ interface IDisplayManager {

		// Sets the HDR conversion mode for a device.
		// Requires MODIFY_HDR_CONVERSION_MODE permission.
		@JavaPassthrough(annotation = "@android.annotation.RequiresPermission(android.Manifest"
		+ ".permission.MODIFY_HDR_CONVERSION_MODE)")
		@EnforcePermission("MODIFY_HDR_CONVERSION_MODE")
		void setHdrConversionMode(in HdrConversionMode hdrConversionMode);
		HdrConversionMode getHdrConversionModeSetting();
		HdrConversionMode getHdrConversionMode();

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

+19 −18

Original line number	Diff line number	Diff line
		@@ -21,8 +21,11 @@ import static android.Manifest.permission.ADD_MIRROR_DISPLAY;
		import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
		import static android.Manifest.permission.CAPTURE_SECURE_VIDEO_OUTPUT;
		import static android.Manifest.permission.CAPTURE_VIDEO_OUTPUT;
		import static android.Manifest.permission.CONFIGURE_WIFI_DISPLAY;
		import static android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS;
		import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
		import static android.Manifest.permission.MANAGE_DISPLAYS;
		import static android.Manifest.permission.MODIFY_HDR_CONVERSION_MODE;
		import static android.Manifest.permission.RESTRICT_DISPLAY_MODES;
		import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED;
		import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE;
		@@ -4607,13 +4610,13 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(CONFIGURE_WIFI_DISPLAY)
		@Override // Binder call
		public void connectWifiDisplay(String address) {
		connectWifiDisplay_enforcePermission();
		if (address == null) {
		throw new IllegalArgumentException("address must not be null");
		}
		mContext.enforceCallingOrSelfPermission(Manifest.permission.CONFIGURE_WIFI_DISPLAY,
		"Permission required to connect to a wifi display");

		final long token = Binder.clearCallingIdentity();
		try {
		@@ -4638,13 +4641,13 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(CONFIGURE_WIFI_DISPLAY)
		@Override // Binder call
		public void renameWifiDisplay(String address, String alias) {
		renameWifiDisplay_enforcePermission();
		if (address == null) {
		throw new IllegalArgumentException("address must not be null");
		}
		mContext.enforceCallingOrSelfPermission(Manifest.permission.CONFIGURE_WIFI_DISPLAY,
		"Permission required to rename to a wifi display");

		final long token = Binder.clearCallingIdentity();
		try {
		@@ -4654,13 +4657,13 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(CONFIGURE_WIFI_DISPLAY)
		@Override // Binder call
		public void forgetWifiDisplay(String address) {
		forgetWifiDisplay_enforcePermission();
		if (address == null) {
		throw new IllegalArgumentException("address must not be null");
		}
		mContext.enforceCallingOrSelfPermission(Manifest.permission.CONFIGURE_WIFI_DISPLAY,
		"Permission required to forget to a wifi display");

		final long token = Binder.clearCallingIdentity();
		try {
		@@ -5004,7 +5007,7 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override
		public BrightnessInfo getBrightnessInfo(int displayId) {
		getBrightnessInfo_enforcePermission();
		@@ -5035,7 +5038,7 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public void setTemporaryBrightness(int displayId, float brightness) {
		setTemporaryBrightness_enforcePermission();
		@@ -5050,7 +5053,7 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public void setBrightness(int displayId, float brightness) {
		setBrightness_enforcePermission();
		@@ -5074,12 +5077,11 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public float getBrightness(int displayId) {
		getBrightness_enforcePermission();
		float brightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;
		mContext.enforceCallingOrSelfPermission(
		Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS,
		"Permission required to set the display's brightness");
		final long token = Binder.clearCallingIdentity();
		try {
		synchronized (mSyncRoot) {
		@@ -5094,7 +5096,7 @@ public final class DisplayManagerService extends SystemService {
		return brightness;
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public void setTemporaryAutoBrightnessAdjustment(float adjustment) {
		setTemporaryAutoBrightnessAdjustment_enforcePermission();
		@@ -5169,14 +5171,13 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		@EnforcePermission(MODIFY_HDR_CONVERSION_MODE)
		@Override // Binder call
		public void setHdrConversionMode(HdrConversionMode hdrConversionMode) {
		setHdrConversionMode_enforcePermission();
		if (!mIsHdrOutputControlEnabled) {
		return;
		}
		mContext.enforceCallingOrSelfPermission(
		Manifest.permission.MODIFY_HDR_CONVERSION_MODE,
		"Permission required to set the HDR conversion mode.");
		final long token = Binder.clearCallingIdentity();
		try {
		setHdrConversionModeInternal(hdrConversionMode);
		@@ -5340,7 +5341,7 @@ public final class DisplayManagerService extends SystemService {
		? ddc.getHdrBrightnessData().highestHdrSdrRatio : 1;
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public float[] getDozeBrightnessSensorValueToBrightness(int displayId) {
		getDozeBrightnessSensorValueToBrightness_enforcePermission();
		@@ -5353,7 +5354,7 @@ public final class DisplayManagerService extends SystemService {
		return ddc.getDozeBrightnessSensorValueToBrightness();
		}

		@EnforcePermission(android.Manifest.permission.CONTROL_DISPLAY_BRIGHTNESS)
		@EnforcePermission(CONTROL_DISPLAY_BRIGHTNESS)
		@Override // Binder call
		public float getDefaultDozeBrightness(int displayId) {
		getDefaultDozeBrightness_enforcePermission();

services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java

+311 −11

File changed.

Preview size limit exceeded, changes collapsed.