From 92cb84d4e5c613d3a0e894f7675abb2f47b49c3c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 23 Aug 2016 13:25:58 -0700 Subject: [PATCH] Checking for duplicate intent with proper source bounds. Since we are doing a equality check on the intent, items which already have the bounds attached to the intent will not get matched, causing duplicate icons Bug: 27176189 Change-Id: Ia9ed9120b04e9c234304995aed13777a5773119e (cherry picked from commit cbfe71dba38af1d1cd2d2372b649537d7d94610b) --- src/com/android/launcher3/LauncherModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 6a63110b11..60e07f9b6f 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -862,7 +862,9 @@ public class LauncherModel extends BroadcastReceiver Intent targetIntent = info.promisedIntent == null ? info.intent : info.promisedIntent; if (targetIntent != null && info.user.equals(user)) { - String s = targetIntent.toUri(0); + Intent copyIntent = new Intent(targetIntent); + copyIntent.setSourceBounds(intent.getSourceBounds()); + String s = copyIntent.toUri(0); if (intentWithPkg.equals(s) || intentWithoutPkg.equals(s)) { return true; }