summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-10-24 12:20:20 -0700
committerAdam Cohen <adamcohen@google.com>2014-10-24 12:44:20 -0700
commita33f11e20a62bf49596c0dcd8741e3944a57b2f9 (patch)
treecc94b59f0dc89c4b85d775dc065b586ed3d73d6d /src/com/android
parent4a080dcadd532dd259de596729a1cd6e949bdae4 (diff)
downloadandroid_packages_apps_Trebuchet-a33f11e20a62bf49596c0dcd8741e3944a57b2f9.tar.gz
android_packages_apps_Trebuchet-a33f11e20a62bf49596c0dcd8741e3944a57b2f9.tar.bz2
android_packages_apps_Trebuchet-a33f11e20a62bf49596c0dcd8741e3944a57b2f9.zip
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
Diffstat (limited to 'src/com/android')
-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 9150dc0c1..f2d005e65 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1480,9 +1480,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;