commit f630865f60abf4d7d4a1eb4a3fa7790b5579a2dc
author Tony Mak <tonymak@google.com> Sat Dec 02 16:56:22 2017 +0000
committer Tony Mak <tonymak@google.com> Mon Dec 04 10:20:27 2017 +0000
tree 89c0d5b7cfa8fd8cc238210715b01cb39305f0b5
parent 4d9d4542e01ab30e48a21f6da0ede2c3d7d053b3

Fix failed to launch work app shortcut when work mode is ON

FIX=70143968

Change-Id: If2a98843410dcef466cf4d7868b8564f07a49e30

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b7986da..44b64d9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1969,7 +1969,8 @@
         final ShortcutInfo shortcut = (ShortcutInfo) tag;
 
         if (shortcut.isDisabled()) {
-            if ((shortcut.runtimeStatusFlags &
+            final int disabledFlags = shortcut.runtimeStatusFlags & ShortcutInfo.FLAG_DISABLED_MASK;
+            if ((disabledFlags &
                     ~FLAG_DISABLED_SUSPENDED &
                     ~FLAG_DISABLED_QUIET_USER) == 0) {
                 // If the app is only disabled because of the above flags, launch activity anyway.