commit 769e1e31f58831be5db35e6d33f36486650cac78
author Fan Zhang <zhfan@google.com> Tue Oct 31 22:54:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 22:54:07 2017 +0000
tree 1d9f5a087ac5e32223fe6e317e3af0f9712b1294
parent a954c8c716d3a08f5aa2d268dde4a71e188801b0
parent cd66862b08ac16644693d9ff49edec5af10bbd78

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08

Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
index d9af800..7728601 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -38,6 +38,7 @@
             mDark = true;
         }
         super.onCreate(savedState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         boolean deviceLocked = getSystemService(KeyguardManager.class).isKeyguardLocked();
         if (deviceLocked && getIntent().getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)) {