From 6108cce37c98881d8edd5d934671abf13751d513 Mon Sep 17 00:00:00 2001 From: Philip Junker Date: Fri, 14 Oct 2022 18:56:01 +0200 Subject: [PATCH] Only list apps with android.permission.TURN_SCREEN_ON. Bug: 237045954 Test: manually verified the special app access list. Test: atest SettingsRoboTests:TurnScreenOnDetailsTest Test: atest SettingsRoboTests:TurnScreenOnSettingsTest Change-Id: Ic7ded92d7be307ba90d7871224f756422589c792 --- .../specialaccess/turnscreenon/TurnScreenOnSettings.java | 2 +- .../specialaccess/turnscreenon/TurnScreenOnSettingsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java b/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java index 302d6b595ae..cdfff589682 100644 --- a/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java +++ b/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java @@ -205,7 +205,7 @@ public class TurnScreenOnSettings extends EmptyTextSettings { if (IGNORE_PACKAGE_LIST.contains(packageName)) { return false; } - return packageManager.checkPermission(Manifest.permission.WAKE_LOCK, packageName) + return packageManager.checkPermission(Manifest.permission.TURN_SCREEN_ON, packageName) == PackageManager.PERMISSION_GRANTED; } diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettingsTest.java index 6325d9d8779..a2602110500 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettingsTest.java @@ -176,7 +176,7 @@ public class TurnScreenOnSettingsTest { private PackageInfo createPackage(String packageName, boolean hasTurnScreenOnPermission) { PackageInfo pi = new PackageInfo(); - when(mPackageManager.checkPermission(Manifest.permission.WAKE_LOCK, + when(mPackageManager.checkPermission(Manifest.permission.TURN_SCREEN_ON, packageName)).thenReturn( hasTurnScreenOnPermission ? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED);