Merge "Fix intdefs that were incorrectly defining "flag"" (4ca6de77) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CallForwardingInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ public final class CallForwardingInfo implements Parcelable {
		* Call forwarding reason types
		* @hide
		*/
		@IntDef(flag = true, prefix = { "REASON_" }, value = {
		@IntDef(prefix = { "REASON_" }, value = {
		REASON_UNCONDITIONAL,
		REASON_BUSY,
		REASON_NO_REPLY,

+1 −1

Original line number	Diff line number	Diff line
		@@ -9436,7 +9436,7 @@ public class TelephonyManager {
		}

		/** @hide */
		@IntDef(flag = true, prefix = { "CDMA_SUBSCRIPTION_" }, value = {
		@IntDef(prefix = { "CDMA_SUBSCRIPTION_" }, value = {
		CDMA_SUBSCRIPTION_UNKNOWN,
		CDMA_SUBSCRIPTION_RUIM_SIM,
		CDMA_SUBSCRIPTION_NV

+2 −4

Original line number	Diff line number	Diff line
		@@ -49,8 +49,7 @@ public final class ImsExternalCallState implements Parcelable {
		public static final int CALL_STATE_TERMINATED = 2;

		/*@hide/
		@IntDef(flag = true,
		value = {
		@IntDef(value = {
		CALL_STATE_CONFIRMED,
		CALL_STATE_TERMINATED
		},
		@@ -59,8 +58,7 @@ public final class ImsExternalCallState implements Parcelable {
		public @interface ExternalCallState {}

		/*@hide/
		@IntDef(flag = true,
		value = {
		@IntDef(value = {
		ImsCallProfile.CALL_TYPE_VOICE,
		ImsCallProfile.CALL_TYPE_VT_TX,
		ImsCallProfile.CALL_TYPE_VT_RX,

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ public final class ImsSsData implements Parcelable {


		/*@hide/
		@IntDef(flag = true, prefix = {"SS_"}, value = {
		@IntDef(prefix = {"SS_"}, value = {
		SS_ACTIVATION,
		SS_DEACTIVATION,
		SS_INTERROGATION,
		@@ -89,7 +89,7 @@ public final class ImsSsData implements Parcelable {
		public static final int SS_ERASURE = 4;

		/*@hide/
		@IntDef(flag = true, prefix = {"SS_"}, value = {
		@IntDef(prefix = {"SS_"}, value = {
		SS_ALL_TELE_AND_BEARER_SERVICES,
		SS_ALL_TELESEVICES,
		SS_TELEPHONY,
		@@ -190,7 +190,7 @@ public final class ImsSsData implements Parcelable {
		public static final int RESULT_SUCCESS = 0;

		/** @hide */
		@IntDef(flag = true, prefix = { "SS_" }, value = {
		@IntDef(prefix = { "SS_" }, value = {
		SS_CFU,
		SS_CF_BUSY,
		SS_CF_NO_REPLY,

+1 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,7 @@ public class ImsRegistrationImplBase {
		* @hide
		*/
		// Defines the underlying radio technology type that we have registered for IMS over.
		@IntDef(flag = true,
		value = {
		@IntDef(value = {
		REGISTRATION_TECH_NONE,
		REGISTRATION_TECH_LTE,
		REGISTRATION_TECH_IWLAN