diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-19 00:01:52 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-19 00:01:52 +0000 |
| commit | 6eb49b229dd53afb6d3979b7e5e22879dadeedc9 (patch) | |
| tree | 2959d5f8b9181f1231f5a71cb7cefd64f2b62d86 | |
| parent | 8897a25115a78edd4357bb6f1962d4fac52d3ae1 (diff) | |
| parent | 8cddb2643dd823721ba5c897a089d06c56b50a60 (diff) | |
| download | CalendarProvider-6eb49b229dd53afb6d3979b7e5e22879dadeedc9.tar.gz | |
Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417, 13924418, 13924419, 13923941, 13924588, 13923901, 13923902, 13924076, 13924077, 13924420, 13924421, 13924422, 13924423, 13924424, 13924645, 13924589, 13922107, 13924332, 13924333, 13924334, 13924335, 13924336, 13924665, 13923963, 13924646, 13924590, 13924666, 13923971, 13923942] into rvc-qpr2-releaseandroid-11.0.0_r37android-11.0.0_r36android11-qpr2-release
Change-Id: Ib293d039f909ccdbcd69b77324d7ab9e8b52a0a5
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/providers/calendar/CalendarDebugActivity.java | 7 |
2 files changed, 8 insertions, 0 deletions
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 @@ public class CalendarDebugActivity extends Activity implements OnClickListener { 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(); |