Adding isDemoUser method in userManager (b5bf3e6c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/compat/UserManagerCompat.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,4 +58,6 @@ public abstract class UserManagerCompat {
		public abstract long getUserCreationTime(UserHandleCompat user);
		public abstract boolean isQuietModeEnabled(UserHandleCompat user);
		public abstract boolean isUserUnlocked(UserHandleCompat user);

		public abstract boolean isDemoUser();
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -60,4 +60,9 @@ public class UserManagerCompatV16 extends UserManagerCompat {
		public boolean isUserUnlocked(UserHandleCompat user) {
		return true;
		}

		@Override
		public boolean isDemoUser() {
		return false;
		}
		}

+11 −7

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@ import android.annotation.TargetApi;
		import android.content.Context;
		import android.os.Build;

		import com.android.launcher3.Utilities;

		@TargetApi(Build.VERSION_CODES.N)
		public class UserManagerCompatVN extends UserManagerCompatVL {

		private static final String TAG = "UserManagerCompatVN";

		UserManagerCompatVN(Context context) {
		super(context);
		}
		@@ -36,11 +36,15 @@ public class UserManagerCompatVN extends UserManagerCompatVL {

		@Override
		public boolean isUserUnlocked(UserHandleCompat user) {
		// TODO: Remove the try-catch block when the API permission has been relaxed (b/30475753)
		try {
		return mUserManager.isUserUnlocked(user.getUser());
		} catch (RuntimeException e) {
		return !isQuietModeEnabled(user);
		}

		@Override
		public boolean isDemoUser() {
		if (Utilities.isNycMR1OrAbove()) {
		return mUserManager.isDemoUser();
		} else {
		return super.isDemoUser();
		}
		}
		}