diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-22 12:27:04 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-07-22 13:56:13 -0700 |
| commit | 0c4a64451eb868d1f6abda45896dc2d2c4a9f2de (patch) | |
| tree | a2cd07e91fd473ac81286acee759742e9164a4ed | |
| parent | 82cc3fe6c77322d93ff74b25354e4bca77ab4a83 (diff) | |
| download | android_packages_apps_Trebuchet-0c4a64451eb868d1f6abda45896dc2d2c4a9f2de.tar.gz android_packages_apps_Trebuchet-0c4a64451eb868d1f6abda45896dc2d2c4a9f2de.tar.bz2 android_packages_apps_Trebuchet-0c4a64451eb868d1f6abda45896dc2d2c4a9f2de.zip | |
Merging motorola's patch to fix ClassCastException
issue: 15518616
Change-Id: I7d707f12cb20be9aa24d7ea86051f3712b3534af
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index a8bace8e2..19da2ae4e 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -3554,18 +3554,18 @@ public class LauncherModel extends BroadcastReceiver mCollator = Collator.getInstance(); } public final int compare(LauncherActivityInfoCompat a, LauncherActivityInfoCompat b) { - CharSequence labelA, labelB; + String labelA, labelB; ComponentName keyA = a.getComponentName(); ComponentName keyB = b.getComponentName(); if (mLabelCache.containsKey(keyA)) { - labelA = mLabelCache.get(keyA); + labelA = mLabelCache.get(keyA).toString(); } else { labelA = a.getLabel().toString().trim(); mLabelCache.put(keyA, labelA); } if (mLabelCache.containsKey(keyB)) { - labelB = mLabelCache.get(keyB); + labelB = mLabelCache.get(keyB).toString(); } else { labelB = b.getLabel().toString().trim(); |