commit 23cbe85610f780134cc77dd4a54732a22ed6e86e
author Yohei Yukawa <yukawa@google.com> Tue May 17 16:42:58 2016 -0700
committer Yohei Yukawa <yukawa@google.com> Tue May 17 16:42:58 2016 -0700
tree ea498f4ec45f5d54f0cca16c705de21d67c6cbe2
parent e1f6975ebc1499ddcb493666f884ef0d8e042255

Move LocaleList to avoid layering violation.

Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 76f5175..8cc165d 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -48,6 +48,7 @@
 import android.os.Bundle;
 import android.os.DropBoxManager;
 import android.os.IBinder;
+import android.os.LocaleList;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -58,7 +59,6 @@
 import android.util.AndroidException;
 import android.util.ArrayMap;
 import android.util.ArraySet;
-import android.util.LocaleList;
 import android.util.Log;
 
 import android.util.MemoryIntArray;
@@ -2650,7 +2650,7 @@
          * The serialized system locale value.
          *
          * Do not use this value directory.
-         * To get system locale, use {@link android.util.LocaleList#getDefault} instead.
+         * To get system locale, use {@link LocaleList#getDefault} instead.
          * To update system locale, use {@link com.android.internal.app.LocalePicker#updateLocales}
          * instead.
          * @hide