commit 87bee403ed919e31c50b4ae921acc4db1b2d96e4
author Sunny Goyal <sunnygoyal@google.com> Tue Jul 22 20:59:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 22 16:21:19 2014 +0000
tree 937360898f533277328037c714e129a111149bf6
parent 300c1504488a35372cec8c431e4d833df886ec8e
parent 0c4a64451eb868d1f6abda45896dc2d2c4a9f2de

Merge "Merging motorola's patch to fix ClassCastException" into ub-now-master

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index db5e7cf..673fef9 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3583,18 +3583,18 @@
             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();