Merge "Removing the profile extra from intent and using the profile id from the profile column" into ub-launcher3-dorval

am: 77ff9a4343 Change-Id: Ib0cd8cb8f963b78a9cd53ed896aeb6e4f6163683
2017-03-21 23:21:26 +00:00
parent e28fb8354e 77ff9a4343
commit d23f37794f
11 changed files with 36 additions and 40 deletions
@@ -468,13 +468,8 @@ public final class Utilities {
                && TextUtils.isEmpty(launchIntent.getDataString())) {
            // An app target can either have no extra or have ItemInfo.EXTRA_PROFILE.
            Bundle extras = launchIntent.getExtras();
-            if (extras == null) {
-                return true;
-            } else {
-                Set<String> keys = extras.keySet();
-                return keys.size() == 1 && keys.contains(ItemInfo.EXTRA_PROFILE);
-            }
-        };
+            return extras == null || extras.keySet().isEmpty();
+        }
        return false;
    }