Merge "refactor data/voice roaming states"

am: 6bd29ab2df Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
2018-10-12 11:20:18 -07:00
parent 24591d2641 6bd29ab2df
commit 652ec06948
5 changed files with 116 additions and 84 deletions
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3945,6 +3945,12 @@ public class Intent implements Parcelable, Cloneable {
    @SystemApi
    public static final String EXTRA_LTE_EARFCN_RSRP_BOOST = "LteEarfcnRsrpBoost";

+    /**
+     * An parcelable extra used with {@link #ACTION_SERVICE_STATE} representing the service state.
+     * @hide
+     */
+    public static final String EXTRA_SERVICE_STATE = "android.intent.extra.SERVICE_STATE";
+
    /**
     * The name of the extra used to define the text to be processed, as a
     * CharSequence. Note that this may be a styled CharSequence, so you must use