drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix intdefs that were incorrectly defining "flag""

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-30 20:34:35 +00:00
committed by Gerrit Code Review
parent 28f3536f6d 3df3321925
commit 4ca6de77af
5 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/CallForwardingInfo.java
View File

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

2
telephony/java/android/telephony/TelephonyManager.java
View File

@ -9436,7 +9436,7 @@ public class TelephonyManager {
} }
/** @hide */ /** @hide */
@IntDef(flag = true, prefix = { "CDMA_SUBSCRIPTION_" }, value = { @IntDef(prefix = { "CDMA_SUBSCRIPTION_" }, value = {
CDMA_SUBSCRIPTION_UNKNOWN, CDMA_SUBSCRIPTION_UNKNOWN,
CDMA_SUBSCRIPTION_RUIM_SIM, CDMA_SUBSCRIPTION_RUIM_SIM,
CDMA_SUBSCRIPTION_NV CDMA_SUBSCRIPTION_NV

6
telephony/java/android/telephony/ims/ImsExternalCallState.java
View File

@ -49,8 +49,7 @@ public final class ImsExternalCallState implements Parcelable {
public static final int CALL_STATE_TERMINATED = 2; public static final int CALL_STATE_TERMINATED = 2;
/**@hide*/ /**@hide*/
@IntDef(flag = true, @IntDef(value = {
value = {
CALL_STATE_CONFIRMED, CALL_STATE_CONFIRMED,
CALL_STATE_TERMINATED CALL_STATE_TERMINATED
}, },
@ -59,8 +58,7 @@ public final class ImsExternalCallState implements Parcelable {
public @interface ExternalCallState {} public @interface ExternalCallState {}
/**@hide*/ /**@hide*/
@IntDef(flag = true, @IntDef(value = {
value = {
ImsCallProfile.CALL_TYPE_VOICE, ImsCallProfile.CALL_TYPE_VOICE,
ImsCallProfile.CALL_TYPE_VT_TX, ImsCallProfile.CALL_TYPE_VT_TX,
ImsCallProfile.CALL_TYPE_VT_RX, ImsCallProfile.CALL_TYPE_VT_RX,

6
telephony/java/android/telephony/ims/ImsSsData.java
View File

@ -72,7 +72,7 @@ public final class ImsSsData implements Parcelable {
/**@hide*/ /**@hide*/
@IntDef(flag = true, prefix = {"SS_"}, value = { @IntDef(prefix = {"SS_"}, value = {
SS_ACTIVATION, SS_ACTIVATION,
SS_DEACTIVATION, SS_DEACTIVATION,
SS_INTERROGATION, SS_INTERROGATION,
@ -89,7 +89,7 @@ public final class ImsSsData implements Parcelable {
public static final int SS_ERASURE = 4; public static final int SS_ERASURE = 4;
/**@hide*/ /**@hide*/
@IntDef(flag = true, prefix = {"SS_"}, value = { @IntDef(prefix = {"SS_"}, value = {
SS_ALL_TELE_AND_BEARER_SERVICES, SS_ALL_TELE_AND_BEARER_SERVICES,
SS_ALL_TELESEVICES, SS_ALL_TELESEVICES,
SS_TELEPHONY, SS_TELEPHONY,
@ -190,7 +190,7 @@ public final class ImsSsData implements Parcelable {
public static final int RESULT_SUCCESS = 0; public static final int RESULT_SUCCESS = 0;
/** @hide */ /** @hide */
@IntDef(flag = true, prefix = { "SS_" }, value = { @IntDef(prefix = { "SS_" }, value = {
SS_CFU, SS_CFU,
SS_CF_BUSY, SS_CF_BUSY,
SS_CF_NO_REPLY, SS_CF_NO_REPLY,

3
telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java
View File

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