summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-10-24 19:20:20 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-28 01:55:56 (GMT)
commit1517149c91e06b84c6cfaf727394c94af5b71284 (patch)
tree95d3e54a3428b003b0f6d22b61de3e954f009050
parentbf18c372cd9abf7c24495fd94c535fd850539060 (diff)
downloadandroid_packages_apps_Trebuchet-1517149c91e06b84c6cfaf727394c94af5b71284.zip
android_packages_apps_Trebuchet-1517149c91e06b84c6cfaf727394c94af5b71284.tar.gz
android_packages_apps_Trebuchet-1517149c91e06b84c6cfaf727394c94af5b71284.tar.bz2
Was seeing some duplicated icons in the migration flow
-> The only delta between the two icons was slightly different flags -> No need to consider flags for the purposes of duplication Change-Id: I161f6ad6023d829e5ebbb15f1a9fbc9306795d80
-rw-r--r--src/com/android/launcher3/LauncherProvider.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 9f44e60..eda0fe2 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1560,9 +1560,13 @@ public class LauncherProvider extends ContentProvider {
// Canonicalize
// the Play Store sets the package parameter, but Launcher
- // does not, so we clear that out to keep them the same
+ // does not, so we clear that out to keep them the same.
+ // Also ignore intent flags for the purposes of deduping.
intent.setPackage(null);
+ int flags = intent.getFlags();
+ intent.setFlags(0);
final String key = intent.toUri(0);
+ intent.setFlags(flags);
if (seenIntents.contains(key)) {
Launcher.addDumpLog(TAG, "skipping duplicate", true);
continue;