diff --git a/api/current.xml b/api/current.xml
index e6f37888781b7..7cb44d1329c0d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -136069,6 +136069,17 @@
  visibility="public"
 >
 </field>
+<field name="TTS_ENABLED_PLUGINS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;tts_enabled_plugins&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="TTS_USE_DEFAULTS"
  type="java.lang.String"
  transient="false"
@@ -384004,7 +384015,17 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="x" type="org.json.JSONTokener">
+<parameter name="copyFrom" type="java.util.Collection">
+</parameter>
+</constructor>
+<constructor name="JSONArray"
+ type="org.json.JSONArray"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="readFrom" type="org.json.JSONTokener">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384016,21 +384037,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="string" type="java.lang.String">
+<parameter name="json" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
 </constructor>
-<constructor name="JSONArray"
- type="org.json.JSONArray"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="collection" type="java.util.Collection">
-</parameter>
-</constructor>
 <method name="get"
  return="java.lang.Object"
  abstract="false"
@@ -384228,7 +384239,7 @@
 >
 <parameter name="index" type="int">
 </parameter>
-<parameter name="defaultValue" type="boolean">
+<parameter name="fallback" type="boolean">
 </parameter>
 </method>
 <method name="optDouble"
@@ -384256,7 +384267,7 @@
 >
 <parameter name="index" type="int">
 </parameter>
-<parameter name="defaultValue" type="double">
+<parameter name="fallback" type="double">
 </parameter>
 </method>
 <method name="optInt"
@@ -384284,7 +384295,7 @@
 >
 <parameter name="index" type="int">
 </parameter>
-<parameter name="defaultValue" type="int">
+<parameter name="fallback" type="int">
 </parameter>
 </method>
 <method name="optJSONArray"
@@ -384338,7 +384349,7 @@
 >
 <parameter name="index" type="int">
 </parameter>
-<parameter name="defaultValue" type="long">
+<parameter name="fallback" type="long">
 </parameter>
 </method>
 <method name="optString"
@@ -384366,7 +384377,7 @@
 >
 <parameter name="index" type="int">
 </parameter>
-<parameter name="defaultValue" type="java.lang.String">
+<parameter name="fallback" type="java.lang.String">
 </parameter>
 </method>
 <method name="put"
@@ -384546,7 +384557,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="indentFactor" type="int">
+<parameter name="indentSpaces" type="int">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384567,7 +384578,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="message" type="java.lang.String">
+<parameter name="s" type="java.lang.String">
 </parameter>
 </constructor>
 </class>
@@ -384594,9 +384605,17 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="jo" type="org.json.JSONObject">
+<parameter name="copyFrom" type="java.util.Map">
 </parameter>
-<parameter name="sa" type="java.lang.String[]">
+</constructor>
+<constructor name="JSONObject"
+ type="org.json.JSONObject"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="readFrom" type="org.json.JSONTokener">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384608,7 +384627,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="x" type="org.json.JSONTokener">
+<parameter name="json" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384620,17 +384639,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="map" type="java.util.Map">
+<parameter name="copyFrom" type="org.json.JSONObject">
 </parameter>
-</constructor>
-<constructor name="JSONObject"
- type="org.json.JSONObject"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="string" type="java.lang.String">
+<parameter name="names" type="java.lang.String[]">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384645,7 +384656,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="java.lang.Object">
 </parameter>
@@ -384662,7 +384673,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384677,7 +384688,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384692,7 +384703,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384707,7 +384718,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384722,7 +384733,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384737,7 +384748,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384752,7 +384763,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384767,7 +384778,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384782,7 +384793,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="isNull"
@@ -384795,7 +384806,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="keys"
@@ -384841,7 +384852,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="n" type="java.lang.Number">
+<parameter name="number" type="java.lang.Number">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -384856,7 +384867,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optBoolean"
@@ -384869,7 +384880,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optBoolean"
@@ -384882,9 +384893,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
-<parameter name="defaultValue" type="boolean">
+<parameter name="fallback" type="boolean">
 </parameter>
 </method>
 <method name="optDouble"
@@ -384897,7 +384908,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optDouble"
@@ -384910,9 +384921,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
-<parameter name="defaultValue" type="double">
+<parameter name="fallback" type="double">
 </parameter>
 </method>
 <method name="optInt"
@@ -384925,7 +384936,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optInt"
@@ -384938,9 +384949,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
-<parameter name="defaultValue" type="int">
+<parameter name="fallback" type="int">
 </parameter>
 </method>
 <method name="optJSONArray"
@@ -384953,7 +384964,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optJSONObject"
@@ -384966,7 +384977,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optLong"
@@ -384979,7 +384990,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optLong"
@@ -384992,9 +385003,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
-<parameter name="defaultValue" type="long">
+<parameter name="fallback" type="long">
 </parameter>
 </method>
 <method name="optString"
@@ -385007,7 +385018,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="optString"
@@ -385020,9 +385031,9 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
-<parameter name="defaultValue" type="java.lang.String">
+<parameter name="fallback" type="java.lang.String">
 </parameter>
 </method>
 <method name="put"
@@ -385035,7 +385046,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="boolean">
 </parameter>
@@ -385052,7 +385063,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="double">
 </parameter>
@@ -385069,7 +385080,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="int">
 </parameter>
@@ -385086,7 +385097,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="long">
 </parameter>
@@ -385103,7 +385114,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="java.lang.Object">
 </parameter>
@@ -385120,7 +385131,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <parameter name="value" type="java.lang.Object">
 </parameter>
@@ -385137,7 +385148,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="string" type="java.lang.String">
+<parameter name="data" type="java.lang.String">
 </parameter>
 </method>
 <method name="remove"
@@ -385150,7 +385161,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="key" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 </method>
 <method name="toJSONArray"
@@ -385178,7 +385189,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="indentFactor" type="int">
+<parameter name="indentSpaces" type="int">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385259,7 +385270,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="s" type="java.lang.String">
+<parameter name="name" type="java.lang.String">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385287,7 +385298,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="b" type="boolean">
+<parameter name="value" type="java.lang.Object">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385302,7 +385313,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="d" type="double">
+<parameter name="value" type="boolean">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385317,7 +385328,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="l" type="long">
+<parameter name="value" type="double">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385332,7 +385343,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="o" type="java.lang.Object">
+<parameter name="value" type="long">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385353,7 +385364,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="s" type="java.lang.String">
+<parameter name="in" type="java.lang.String">
 </parameter>
 </constructor>
 <method name="back"
@@ -385377,7 +385388,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="c" type="char">
+<parameter name="hex" type="char">
 </parameter>
 </method>
 <method name="more"
@@ -385427,7 +385438,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="n" type="int">
+<parameter name="length" type="int">
 </parameter>
 <exception name="JSONException" type="org.json.JSONException">
 </exception>
@@ -385470,7 +385481,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="d" type="char">
+<parameter name="excluded" type="java.lang.String">
 </parameter>
 </method>
 <method name="nextTo"
@@ -385483,7 +385494,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="delimiters" type="java.lang.String">
+<parameter name="excluded" type="char">
 </parameter>
 </method>
 <method name="nextValue"
@@ -385509,7 +385520,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="to" type="java.lang.String">
+<parameter name="thru" type="java.lang.String">
 </parameter>
 </method>
 <method name="skipTo"
@@ -385535,7 +385546,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="message" type="java.lang.String">
+<parameter name="text" type="java.lang.String">
 </parameter>
 </method>
 </class>
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 66f340e32ae60..13f87803ffa5c 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2457,6 +2457,11 @@ public final class Settings {
          */
         public static final String TTS_DEFAULT_VARIANT = "tts_default_variant";
 
+        /**
+         * Space delimited list of plugin packages that are enabled.
+         */
+        public static final String TTS_ENABLED_PLUGINS = "tts_enabled_plugins";
+
         /**
          * Whether to notify the user of open networks.
          * <p>
@@ -3286,6 +3291,7 @@ public final class Settings {
             TTS_DEFAULT_SYNTH,
             TTS_DEFAULT_LANG,
             TTS_DEFAULT_COUNTRY,
+            TTS_ENABLED_PLUGINS,
             WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
             WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
             WIFI_NUM_ALLOWED_CHANNELS,