diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-31 13:12:40 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-08-31 13:12:54 -0700 |
commit | b5bf3e6ceeb6f8af433357324a543914fd8ebaf9 (patch) | |
tree | b7f1beb7fbb36fd944956614ef99a6d0a224d1a2 /src/com/android/launcher3/compat | |
parent | dfc8b6685bf330b203cb16b67c39bed936030306 (diff) | |
download | android_packages_apps_Trebuchet-b5bf3e6ceeb6f8af433357324a543914fd8ebaf9.tar.gz android_packages_apps_Trebuchet-b5bf3e6ceeb6f8af433357324a543914fd8ebaf9.tar.bz2 android_packages_apps_Trebuchet-b5bf3e6ceeb6f8af433357324a543914fd8ebaf9.zip |
Adding isDemoUser method in userManager
Change-Id: I0ad2c0e7bfac5eff5e5c95c3e533840921a67dc3
Diffstat (limited to 'src/com/android/launcher3/compat')
3 files changed, 18 insertions, 7 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompat.java b/src/com/android/launcher3/compat/UserManagerCompat.java index 29ed5d9ba..ecf596f78 100644 --- a/src/com/android/launcher3/compat/UserManagerCompat.java +++ b/src/com/android/launcher3/compat/UserManagerCompat.java @@ -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(); } diff --git a/src/com/android/launcher3/compat/UserManagerCompatV16.java b/src/com/android/launcher3/compat/UserManagerCompatV16.java index e678ffa3d..9bd4567a1 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatV16.java +++ b/src/com/android/launcher3/compat/UserManagerCompatV16.java @@ -60,4 +60,9 @@ public class UserManagerCompatV16 extends UserManagerCompat { public boolean isUserUnlocked(UserHandleCompat user) { return true; } + + @Override + public boolean isDemoUser() { + return false; + } } diff --git a/src/com/android/launcher3/compat/UserManagerCompatVN.java b/src/com/android/launcher3/compat/UserManagerCompatVN.java index 771d141c3..be3232302 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVN.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVN.java @@ -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); + return mUserManager.isUserUnlocked(user.getUser()); + } + + @Override + public boolean isDemoUser() { + if (Utilities.isNycMR1OrAbove()) { + return mUserManager.isDemoUser(); + } else { + return super.isDemoUser(); } } } |