diff options
| author | 2017-04-03 18:25:48 +0000 | |
|---|---|---|
| committer | 2017-04-03 18:25:48 +0000 | |
| commit | 6f4841bd3b37a18cee32e3c11e5bb3691e45fcd8 (patch) | |
| tree | 0a57a6bf045bc85a7dd194ff203c375660249f83 | |
| parent | a8c068f7231e558899c49c987240df8685807b6b (diff) | |
| parent | 57132a15137f9d43a276cbadc93dbdd76ef12e06 (diff) | |
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513
Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6b0f8aafcb27..45a93714b22c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9763,6 +9763,8 @@ package android.content { field public static final java.lang.String ACTION_BUG_REPORT = "android.intent.action.BUG_REPORT"; field public static final java.lang.String ACTION_CALL = "android.intent.action.CALL"; field public static final java.lang.String ACTION_CALL_BUTTON = "android.intent.action.CALL_BUTTON"; + field public static final java.lang.String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY"; + field public static final java.lang.String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED"; field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 116224b35d06..81aea8d178d5 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1093,6 +1093,8 @@ public class Intent implements Parcelable, Cloneable { * <p>Output: nothing. * @hide */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY"; /** * Activity action: Perform a call to any number (emergency or not) @@ -1102,6 +1104,8 @@ public class Intent implements Parcelable, Cloneable { * <p>Output: nothing. * @hide */ + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_CALL_PRIVILEGED = "android.intent.action.CALL_PRIVILEGED"; /** |