Merge "Merge "KeyguardManager: clarify behavior for profile with separate... (8533e515) · Commits · e / os / android_frameworks_base

core/java/android/app/KeyguardManager.java

+18 −9

Original line number	Original line	Diff line number	Diff line
	@@ -683,10 +683,11 @@ public class KeyguardManager {
	* <p>		* <p>
	* Specifically, this returns {@code true} if at least one of the following is true:		* Specifically, this returns {@code true} if at least one of the following is true:
	* <ul>		* <ul>
	* <li>The {@link Context}'s user has a secure lock screen. A full user has a secure lock		* <li>The {@link Context}'s user has a secure lock screen. A full user or a profile that uses
	* screen if its lock screen is set to PIN, pattern, or password, as opposed to swipe or none.		* a separate challenge has a secure lock screen if its lock screen is set to PIN, pattern, or
	* A profile that uses a unified challenge is considered to have a secure lock screen if and		* password, as opposed to swipe or none. A profile that uses a unified challenge is
	* only if its parent user has a secure lock screen.</li>		* considered to have a secure lock screen if and only if its parent user has a secure lock
			* screen.</li>
	* <li>At least one SIM card is currently locked and requires a PIN.</li>		* <li>At least one SIM card is currently locked and requires a PIN.</li>
	* </ul>		* </ul>
	* <p>		* <p>
	@@ -733,8 +734,15 @@ public class KeyguardManager {
	* <p>		* <p>
	* For a user that is not the current user but can be switched to (usually this means "another		* For a user that is not the current user but can be switched to (usually this means "another
	* full user"), and that has a PIN, pattern, or password, the device is always considered		* full user"), and that has a PIN, pattern, or password, the device is always considered
	* locked. For a profile with a unified challenge, the device is considered locked if and only		* locked.
	* if the device is locked for the parent user.		* <p>
			* For a profile with a unified challenge, the device locked state is the same as that of the
			* parent user.
			* <p>
			* For a profile with a separate challenge, the device becomes unlocked when the profile's PIN,
			* pattern, password, or biometric is verified. It becomes locked when the parent user becomes
			* locked, the screen turns off, the device reboots, the device policy controller locks the
			* profile, or the timeout set by the device policy controller expires.
	*		*
	* @return {@code true} if the device is currently locked for the user		* @return {@code true} if the device is currently locked for the user
	* @see #isKeyguardLocked()		* @see #isKeyguardLocked()
	@@ -770,9 +778,10 @@ public class KeyguardManager {
	* Returns whether the user has a secure lock screen.		* Returns whether the user has a secure lock screen.
	* <p>		* <p>
	* This returns {@code true} if the {@link Context}'s user has a secure lock screen. A full user		* This returns {@code true} if the {@link Context}'s user has a secure lock screen. A full user
	* has a secure lock screen if its lock screen is set to PIN, pattern, or password, as opposed		* or a profile that uses a separate challenge has a secure lock screen if its lock screen is
	* to swipe or none. A profile that uses a unified challenge is considered to have a secure lock		* set to PIN, pattern, or password, as opposed to swipe or none. A profile that uses a unified
	* screen if and only if its parent user has a secure lock screen.		* challenge is considered to have a secure lock screen if and only if its parent user has a
			* secure lock screen.
	* <p>		* <p>
	* This method does not consider whether the lock screen is currently showing or not.		* This method does not consider whether the lock screen is currently showing or not.
	* <p>		* <p>