Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev (5df14a60) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}

		/**