Merge "Snap for 7487883 from dfdd6c2345be9ff1f3a36ab0cf574982d5c982b7 to sdk-release" into sdk-release
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 90ab5b8..84011cd 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();