summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 20:33:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-04 20:33:12 +0000
commit83b9e9fa5c3440d55d5ac60e5b908d7cc36c6597 (patch)
treee440aa0955e6bb296f6e009914b0ca017e341041
parent2ee5e6b596930be29344540d91e79cd7e9ab9a09 (diff)
parent2151a76f90696a02a43d26a06a02b7e6ff678e57 (diff)
downloadCertInstaller-83b9e9fa5c3440d55d5ac60e5b908d7cc36c6597.tar.gz
KeyChain: Do not allow hiding Cert Install dialog am: afdacb2ec4 am: 2151a76f90
Change-Id: I884baaf530f8b19a8e742334ad9eb74078a649c5
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/certinstaller/CertInstaller.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 56ac884..df73092 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.ACCESS_ALL_DOWNLOADS" />
+ <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
<application android:label="@string/app_name"
android:allowBackup="false">
diff --git a/src/com/android/certinstaller/CertInstaller.java b/src/com/android/certinstaller/CertInstaller.java
index 8b381cb..dd849a7 100644
--- a/src/com/android/certinstaller/CertInstaller.java
+++ b/src/com/android/certinstaller/CertInstaller.java
@@ -16,6 +16,8 @@
package com.android.certinstaller;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -85,6 +87,7 @@ public class CertInstaller extends Activity {
@Override
protected void onCreate(Bundle savedStates) {
super.onCreate(savedStates);
+ getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
mCredentials = createCredentialHelper(getIntent());