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

Commit 3b28a295 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix intdefs that were incorrectly defining "flag"" am: 4ca6de77 am: 3b2d32b5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514749

Change-Id: I2da2701ceb512486d94d0914df8d10451412fca0
parents 923c95ad 3b2d32b5

telephony/java/android/telephony/CallForwardingInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

telephony/java/android/telephony/TelephonyManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

































telephony/java/android/telephony/ims/ImsExternalCallState.java



+2
−4




























Original line number
Original line
Diff line number
Diff line








@@ -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,

































telephony/java/android/telephony/ims/ImsSsData.java



+3
−3




























Original line number
Original line
Diff line number
Diff line








@@ -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,

































telephony/java/android/telephony/ims/stub/ImsRegistrationImplBase.java



+1
−2




























Original line number
Original line
Diff line number
Diff line








@@ -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