Merge "Fixed the issue that unknown contact sort"android-o-preview-3android-n-iot-preview-4n-iot-preview-4

1 files changed, 13 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/ContactLocaleUtils.java b/src/com/android/providers/contacts/ContactLocaleUtils.java
index 3480960a..2b7f1ff4 100644
--- a/src/com/android/providers/contacts/ContactLocaleUtils.java
+++ b/src/com/android/providers/contacts/ContactLocaleUtils.java
@@ -425,6 +425,19 @@ public class ContactLocaleUtils {
             keys.add(romajiName);
             return keys.iterator();
         }
+
+        /**
+         * Returns the number for "#" bucket index.
+         * Adds an additional 'misc' bucket for Kanji characters to the base class set.
+         */
+        @Override
+        public int getNumberBucketIndex() {
+            final int numberBucketIndex = super.getNumberBucketIndex();
+            if (numberBucketIndex > mMiscBucketIndex) {
+                return numberBucketIndex + 1;
+            }
+            return numberBucketIndex;
+        }
     }
 
     /**