Merge "Only list apps with android.permission.TURN_SCREEN_ON."
This commit is contained in:
committed by
Android (Google) Code Review
commit
638693c203
@@ -205,7 +205,7 @@ public class TurnScreenOnSettings extends EmptyTextSettings {
|
|||||||
if (IGNORE_PACKAGE_LIST.contains(packageName)) {
|
if (IGNORE_PACKAGE_LIST.contains(packageName)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return packageManager.checkPermission(Manifest.permission.WAKE_LOCK, packageName)
|
return packageManager.checkPermission(Manifest.permission.TURN_SCREEN_ON, packageName)
|
||||||
== PackageManager.PERMISSION_GRANTED;
|
== PackageManager.PERMISSION_GRANTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ public class TurnScreenOnSettingsTest {
|
|||||||
|
|
||||||
private PackageInfo createPackage(String packageName, boolean hasTurnScreenOnPermission) {
|
private PackageInfo createPackage(String packageName, boolean hasTurnScreenOnPermission) {
|
||||||
PackageInfo pi = new PackageInfo();
|
PackageInfo pi = new PackageInfo();
|
||||||
when(mPackageManager.checkPermission(Manifest.permission.WAKE_LOCK,
|
when(mPackageManager.checkPermission(Manifest.permission.TURN_SCREEN_ON,
|
||||||
packageName)).thenReturn(
|
packageName)).thenReturn(
|
||||||
hasTurnScreenOnPermission ? PackageManager.PERMISSION_GRANTED
|
hasTurnScreenOnPermission ? PackageManager.PERMISSION_GRANTED
|
||||||
: PackageManager.PERMISSION_DENIED);
|
: PackageManager.PERMISSION_DENIED);
|
||||||
|
|||||||
Reference in New Issue
Block a user