commit eaa3ee39cee6117cd5c8415718adc7977d67252c
author Tony Wickham <twickham@google.com> Fri Sep 07 21:15:15 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 07 21:15:15 2018 +0000
tree c30f89973d9de0fc2cd85ea58f804e10c953e0c0
parent d527716cf359a9672d91d13f4bf232013880f1f3
parent a4c1002bacdbe8e0326c3de0411829905e2351bb

Merge "Fix auto install add of installed activity" into ub-launcher3-master

src/com/android/launcher3/model/PackageUpdatedTask.java

diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index 1c0732e..c556083 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -227,16 +227,13 @@
                                     isTargetValid = LauncherAppsCompat.getInstance(context)
                                             .isActivityEnabledForProfile(cn, mUser);
                                 }
-
-                                if (si.hasStatusFlag(ShortcutInfo.FLAG_AUTOINSTALL_ICON)) {
-                                    // Auto install icon
-                                    if (!isTargetValid) {
-                                        if (updateShortcutIntent(context, si, packageName)) {
-                                            infoUpdated = true;
-                                        } else if (si.hasPromiseIconUi()) {
-                                            removedShortcuts.put(si.id, true);
-                                            continue;
-                                        }
+                                if (si.hasStatusFlag(ShortcutInfo.FLAG_AUTOINSTALL_ICON)
+                                        && !isTargetValid) {
+                                    if (updateShortcutIntent(context, si, packageName)) {
+                                        infoUpdated = true;
+                                    } else if (si.hasPromiseIconUi()) {
+                                        removedShortcuts.put(si.id, true);
+                                        continue;
                                     }
                                 } else if (!isTargetValid) {
                                     removedShortcuts.put(si.id, true);