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

Commit 638693c2 authored by Philip Junker's avatar Philip Junker Committed by Android (Google) Code Review
Browse files

Merge "Only list apps with android.permission.TURN_SCREEN_ON."

parents b267f666 6108cce3

src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettings.java

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

    }

tests/robotests/src/com/android/settings/applications/specialaccess/turnscreenon/TurnScreenOnSettingsTest.java

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