Merge "Merging motorola's patch to fix ClassCastException" into ub-now-master (87bee403) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/LauncherModel.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -3583,18 +3583,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();