summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2021-01-19 15:55:43 +0000
committer Linus Tufvesson <lus@google.com> 2021-01-22 15:07:04 +0000
commit01088524cbfdcc806b5ac0bbe348cec36ce9919e (patch)
tree292cf337a13520e7eb51630b409800fbf3a28c8c
parent9698f82a0b108f16accd4969475df65072e0228a (diff)
Update Settings#canDrawOverlays
.. to consider if the caller is holding the permission SYSTEM_APPLICATION_OVERLAY. Bug: 171177581 Test: Manually verified using wellbeing app Change-Id: I58907de33015d7441818110e94612ec3d29d07ad
-rw-r--r--core/java/android/provider/Settings.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 27ba72b97d7c..171407c88b5d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3061,7 +3061,9 @@ public final class Settings {
*/
public static boolean canDrawOverlays(Context context) {
return Settings.isCallingPackageAllowedToDrawOverlays(context, Process.myUid(),
- context.getOpPackageName(), false);
+ context.getOpPackageName(), false) || context.checkSelfPermission(
+ Manifest.permission.SYSTEM_APPLICATION_OVERLAY)
+ == PackageManager.PERMISSION_GRANTED;
}
/**