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

Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev

Browse Source 
am: 5df14a60cf

* commit '5df14a60cf4eb5340d9339244ca7ba2485495531':
  Helper method to check if current user is a demo user

Change-Id: I94f08185ccbc3ce16add9279a584a3c739d03432
This commit is contained in:
Amith Yamasani
2016-05-27 19:32:35 +00:00
committed by android-build-merger
parent 0b94321ecc 5df14a60cf
commit df2297dcf3
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,7 +789,7 @@ public class UserManager {
*/
public boolean isPrimaryUser() {
UserInfo user = getUserInfo(UserHandle.myUserId());
return user != null ? user.isPrimary() : false;
return user != null && user.isPrimary();
}
/**
@@ -855,7 +855,19 @@ public class UserManager {
*/
public boolean isGuestUser() {
UserInfo user = getUserInfo(UserHandle.myUserId());
return user != null ? user.isGuest() : false;
return user != null && user.isGuest();
}
/**
* Checks if the calling app is running in a demo user.
* <p>
* Caller must hold the MANAGE_USERS permission.
* @return whether the caller is a demo user.
* @hide
*/
public boolean isDemoUser() {
UserInfo user = getUserInfo(UserHandle.myUserId());
return user != null && user.isDemo();
}
/**