Merging motorola's patch to fix ClassCastException

issue: 15518616
Change-Id: I7d707f12cb20be9aa24d7ea86051f3712b3534af
This commit is contained in:
Sunny Goyal
2014-07-22 12:27:04 -07:00
parent 82cc3fe6c7
commit 0c4a64451e

View File

@@ -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();