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
This commit is contained in:
@@ -862,7 +862,9 @@ public class LauncherModel extends BroadcastReceiver
|
|||||||
Intent targetIntent = info.promisedIntent == null
|
Intent targetIntent = info.promisedIntent == null
|
||||||
? info.intent : info.promisedIntent;
|
? info.intent : info.promisedIntent;
|
||||||
if (targetIntent != null && info.user.equals(user)) {
|
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)) {
|
if (intentWithPkg.equals(s) || intentWithoutPkg.equals(s)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user