summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/compat/UserManagerCompatVN.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-07-28 12:11:54 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-07-29 16:10:31 -0700
commitd3b87ef1963fb96177ca85bcd6a25879e27e419c (patch)
treef334d5aa2b24626cba47ec1936264a08e385a4b5 /src/com/android/launcher3/compat/UserManagerCompatVN.java
parentc42087e5c011dbf912c0f8b8d27d15ec5a97dca1 (diff)
downloadandroid_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.tar.gz
android_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.tar.bz2
android_packages_apps_Trebuchet-d3b87ef1963fb96177ca85bcd6a25879e27e419c.zip
Adding quiet mode support for shortcuts
> LauncherApps returns empty list when the user is locked. Not relying on LauncherApps in this case > When the user is locked, removing all dynamic shortcuts > Loading shortcuts from DB when the user is locked > Verifying the shortcuts again when the user is available Bug: 30411561 Change-Id: Ib6eb372c5b009cadb86a8f6e781f3f3cbf787ceb
Diffstat (limited to 'src/com/android/launcher3/compat/UserManagerCompatVN.java')
-rw-r--r--src/com/android/launcher3/compat/UserManagerCompatVN.java34
1 files changed, 13 insertions, 21 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVN.java b/src/com/android/launcher3/compat/UserManagerCompatVN.java
index ae41e68a3..771d141c3 100644
--- a/src/com/android/launcher3/compat/UserManagerCompatVN.java
+++ b/src/com/android/launcher3/compat/UserManagerCompatVN.java
@@ -16,15 +16,11 @@
package com.android.launcher3.compat;
+import android.annotation.TargetApi;
import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.util.Log;
+import android.os.Build;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-//TODO: Once gogole3 SDK is updated to N, add @TargetApi(Build.VERSION_CODES.N)
+@TargetApi(Build.VERSION_CODES.N)
public class UserManagerCompatVN extends UserManagerCompatVL {
private static final String TAG = "UserManagerCompatVN";
@@ -35,21 +31,17 @@ public class UserManagerCompatVN extends UserManagerCompatVL {
@Override
public boolean isQuietModeEnabled(UserHandleCompat user) {
- if (user != null) {
- try {
- //TODO: Replace with proper API call once google3 SDK is updated.
- Method isQuietModeEnabledMethod = UserManager.class.getMethod("isQuietModeEnabled",
- UserHandle.class);
- return (boolean) isQuietModeEnabledMethod.invoke(mUserManager, user.getUser());
- } catch (NoSuchMethodError | NoSuchMethodException | IllegalAccessException
- | InvocationTargetException e) {
- Log.e(TAG, "Running on N without isQuietModeEnabled", e);
- } catch (IllegalArgumentException e) {
- // TODO remove this when API is fixed to not throw this
- // when called on user that isn't a managed profile.
- }
+ return mUserManager.isQuietModeEnabled(user.getUser());
+ }
+
+ @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 false;
}
}