From a33f11e20a62bf49596c0dcd8741e3944a57b2f9 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 24 Oct 2014 12:20:20 -0700 Subject: [PATCH] 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 --- src/com/android/launcher3/LauncherProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 9150dc0c1a..f2d005e653 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;