commit 4b9d6a43568b8e143e78dce7fc0ecfb5c1878006
author android-build-team Robot <android-build-team-robot@google.com> Wed Mar 10 22:09:46 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Mar 10 22:09:46 2021 +0000
tree 2959d5f8b9181f1231f5a71cb7cefd64f2b62d86
parent 8897a25115a78edd4357bb6f1962d4fac52d3ae1
parent 26705a8da6f4233e96367f1e177011a852c1a60b

Snap for 7198837 from 26705a8da6f4233e96367f1e177011a852c1a60b to mainline-permission-release

Change-Id: Ide6f219a60e468832dbca7454c6408583b531c71

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9d87918..fd56187 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,6 +18,7 @@
         package="com.android.providers.calendar"
         android:sharedUserId="android.uid.calendar">
 
+    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

src/com/android/providers/calendar/CalendarDebugActivity.java

diff --git a/src/com/android/providers/calendar/CalendarDebugActivity.java b/src/com/android/providers/calendar/CalendarDebugActivity.java
index d06e095..70a1fe4 100644
--- a/src/com/android/providers/calendar/CalendarDebugActivity.java
+++ b/src/com/android/providers/calendar/CalendarDebugActivity.java
@@ -69,6 +69,13 @@
         updateDeleteButton();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
+                .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+    }
+
     private void updateDeleteButton() {
         final boolean fileExist =
             new File(Environment.getExternalStorageDirectory(), OUT_FILE).exists();