commit 1c2fb561e0b7c4dbc6ab71a2114fd457219fbb80
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 07 21:21:10 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 07 21:21:10 2018 +0000
tree 7be2e19d371784ba9075ad22fda99f4d6a452798
parent eaa3ee39cee6117cd5c8415718adc7977d67252c
parent c6043e456832e99914b62b399ea0ca15a3db1f56

Merge "Fixing Launcher stuck in BACKGROUND_APP state when using overview button" into ub-launcher3-master

Android.bp

diff --git a/Android.bp b/Android.bp
index ae54307..78f7277 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-android_library {
+java_library {
     name: "launcher-aosp-tapl",
     static_libs: [
         "androidx.annotation_annotation",

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);

tests/tapl/README

diff --git a/tests/tapl/README b/tests/tapl/README
new file mode 100644
index 0000000..a35d792
--- /dev/null
+++ b/tests/tapl/README
@@ -0,0 +1 @@
+http://go/tapl