Merge "Update Settings#canDrawOverlays"

2021-01-22 17:45:09 +00:00
parent d41834b696 01088524cb
commit cf4848b289
1 changed files with 3 additions and 1 deletions
--- 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;
    }

    /**