Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57132a15 authored Apr 03, 2017 by Brad Ebinger Committed by Android (Google) Code Review Apr 03, 2017

Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev

parents e35d5062 7a8d3528

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -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";

core/java/android/content/Intent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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";

		/**