diff options
| author | Seigo Nonaka <nona@google.com> | 2016-05-18 11:28:56 +0900 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2016-05-18 02:31:05 +0000 |
| commit | a156e670c44e4178821650b7f488b429405757a1 (patch) | |
| tree | a36b229a6ea6afc535d5e60009612b0a5853c961 | |
| parent | 3f2a995bfc639b1b7295e98cd129f46c0d692ddc (diff) | |
| download | ContactsProvider-a156e670c44e4178821650b7f488b429405757a1.tar.gz | |
Fix build break.
The LocaleList location is changed from android.util to android.os by
Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: I8fb59f6d2b3ca4294fec93d809608a3685d6b34e
| -rw-r--r-- | src/com/android/providers/contacts/ContactLocaleUtils.java | 2 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/LocaleSet.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/ContactLocaleUtils.java b/src/com/android/providers/contacts/ContactLocaleUtils.java index 53a5e8d8..553442d4 100644 --- a/src/com/android/providers/contacts/ContactLocaleUtils.java +++ b/src/com/android/providers/contacts/ContactLocaleUtils.java @@ -21,9 +21,9 @@ import android.icu.text.AlphabeticIndex.ImmutableIndex; import android.icu.text.Transliterator; import android.provider.ContactsContract.FullNameStyle; import android.provider.ContactsContract.PhoneticNameStyle; +import android.os.LocaleList; import android.text.TextUtils; import android.util.ArraySet; -import android.util.LocaleList; import android.util.Log; import com.android.providers.contacts.HanziToPinyin.Token; diff --git a/src/com/android/providers/contacts/LocaleSet.java b/src/com/android/providers/contacts/LocaleSet.java index a5fb7158..a926a6fd 100644 --- a/src/com/android/providers/contacts/LocaleSet.java +++ b/src/com/android/providers/contacts/LocaleSet.java @@ -19,8 +19,8 @@ package com.android.providers.contacts; import android.annotation.NonNull; import android.annotation.Nullable; import android.icu.util.ULocale; +import android.os.LocaleList; import android.text.TextUtils; -import android.util.LocaleList; import com.google.common.annotations.VisibleForTesting; import java.util.Locale; |