Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Push unlocking/unlocked state to UserManager" into nyc-dev am: fdc675968c am: 6b366a34ee

Browse Source 
am: 5a8fb5004c

* commit '5a8fb5004ce396716660ca115e1d583c869570b7':
  Push unlocking/unlocked state to UserManager

Change-Id: I9796ecc6ded494c9ad8dd8a10600f6eae593ce01
This commit is contained in:
Fyodor Kupolov
2016-05-11 00:49:42 +00:00
committed by android-build-merger
parent 094fe9c4e5 5a8fb5004c
commit 282e241b11
5 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/UserManager.java
View File

@@ -998,6 +998,7 @@ public class UserManager {
/** {@hide} */
public boolean isUserUnlockingOrUnlocked(@UserIdInt int userId) {
// TODO Switch to using UMS internal isUserUnlockingOrUnlocked
try {
return ActivityManagerNative.getDefault().isUserRunning(userId,
ActivityManager.FLAG_AND_UNLOCKING_OR_UNLOCKED);

14
core/java/android/os/UserManagerInternal.java
View File

@@ -126,4 +126,18 @@ public abstract class UserManagerInternal {
* createAndManageUser is called by the device owner.
*/
public abstract UserInfo createUserEvenWhenDisallowed(String name, int flags);
/**
* Return whether the given user is running in an
* {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKING "unlocking"} or
* {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKED "unlocked"} state.
*/
public abstract boolean isUserUnlockingOrUnlocked(int userId);
/**
* Sets whether the given user is running in an
* {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKING "unlocking"} or
* {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKED "unlocked"} state.
*/
public abstract void setUserUnlockingOrUnlocked(int userId, boolean unlockingOrUnlocked);
}