commit e79c26a9da2a60ea68cacaefe1bb7e7329819326
author Fan Zhang <zhfan@google.com> Tue Oct 31 21:11:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 21:11:26 2017 +0000
tree bd8f508c97d97680cd834f9b9bf8b7ac92b10fc2
parent d88820f3f637113c94b0b93cf70f81216c1ba934
parent e69c4dcb8faeb32100690c375b3671b7ebe38f09

Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am: e69c4dcb8f

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
index d488d7a..3580fcf 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -45,6 +45,7 @@
             mDark = true;
         }
         super.onCreate(savedState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         mIsKeyguardLocked = savedState == null
                 ? getSystemService(KeyguardManager.class).isKeyguardLocked()
                 : savedState.getBoolean(STATE_IS_KEYGUARD_LOCKED, false);