diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-22 20:59:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:21:19 +0000 |
| commit | 87bee403ed919e31c50b4ae921acc4db1b2d96e4 (patch) | |
| tree | 937360898f533277328037c714e129a111149bf6 /src/com/android/launcher3/LauncherModel.java | |
| parent | 300c1504488a35372cec8c431e4d833df886ec8e (diff) | |
| parent | 0c4a64451eb868d1f6abda45896dc2d2c4a9f2de (diff) | |
| download | android_packages_apps_Trebuchet-87bee403ed919e31c50b4ae921acc4db1b2d96e4.tar.gz android_packages_apps_Trebuchet-87bee403ed919e31c50b4ae921acc4db1b2d96e4.tar.bz2 android_packages_apps_Trebuchet-87bee403ed919e31c50b4ae921acc4db1b2d96e4.zip | |
Merge "Merging motorola's patch to fix ClassCastException" into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -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 db5e7cf68..673fef981 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -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(); |