diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-10-24 19:52:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-24 19:52:49 +0000 |
| commit | ac36ed6d5a08b508b3c610cc06a19799da2deb55 (patch) | |
| tree | 750d6f112bef1fdf46bb1592290fdbc1ced32c73 /src/com | |
| parent | 32e34b840576a6857e6ccd308ba9ef1d18f649fe (diff) | |
| parent | a33f11e20a62bf49596c0dcd8741e3944a57b2f9 (diff) | |
| download | android_packages_apps_Trebuchet-ac36ed6d5a08b508b3c610cc06a19799da2deb55.tar.gz android_packages_apps_Trebuchet-ac36ed6d5a08b508b3c610cc06a19799da2deb55.tar.bz2 android_packages_apps_Trebuchet-ac36ed6d5a08b508b3c610cc06a19799da2deb55.zip | |
Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
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; |