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

am: 80af194f8b

Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
This commit is contained in:
Fan Zhang
2017-10-31 21:21:53 +00:00
committed by android-build-merger

View File

@@ -45,6 +45,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
mDark = true; mDark = true;
} }
super.onCreate(savedState); super.onCreate(savedState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
mIsKeyguardLocked = savedState == null mIsKeyguardLocked = savedState == null
? getSystemService(KeyguardManager.class).isKeyguardLocked() ? getSystemService(KeyguardManager.class).isKeyguardLocked()
: savedState.getBoolean(STATE_IS_KEYGUARD_LOCKED, false); : savedState.getBoolean(STATE_IS_KEYGUARD_LOCKED, false);