Snap for 7188176 from aa4273212f161b96429dd2443daf7c274bc3c1f6 to rvc-d2-release

Change-Id: I0958c67f8e8b1682be73453ed05ed2da2e42820e
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" />
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();