summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2018-10-12 11:57:14 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-12 11:57:14 -0700
commit2a670634e3b548b9c35f90e8dece974a1dbed8dc (patch)
tree33e6a28ef27ee89a1a16656a21e4c1137159504a /core/java/android
parent7ccf46bed5dbd4ab585f61b98bf69ace00bd4c18 (diff)
parent6169b043858b2e958bb30db9d408065a3bc4627a (diff)
Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
am: 6169b04385 Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index ca96d5026247..8913748e0c48 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -3955,6 +3955,12 @@ public class Intent implements Parcelable, Cloneable {
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
* {@link Bundle#getCharSequence(String) Bundle.getCharSequence()} to retrieve it.