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

Commit 9fe427c9 authored by Daniel Bright's avatar Daniel Bright
Browse files

Undo commit "Expose constants in Telephony.Carriers" 

Undid carrier constants as @SystemApis.  Also had to move
constants out of annotation.java because any references in
that specific file need to be to public APIs.

Bug: 148170690
Test: make, flash
Merged-In: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
parent 2be788e1

telephony/java/android/telephony/data/ApnSetting.java

+11 −2
Original line number Diff line number Diff line
@@ -125,6 +125,15 @@ public class ApnSetting implements Parcelable { 
    /** Authentication type for PAP or CHAP. */

    public static final int AUTH_TYPE_PAP_OR_CHAP = 3;



    /** @hide */

    @IntDef({

            Telephony.Carriers.SKIP_464XLAT_DEFAULT,

            Telephony.Carriers.SKIP_464XLAT_DISABLE,

            Telephony.Carriers.SKIP_464XLAT_ENABLE,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Skip464XlatStatus {}



    /**

     * APN types for data connections.  These are usage categories for an APN

     * entry.  One APN entry may support multiple APN types, eg, a single APN
@@ -741,7 +750,7 @@ public class ApnSetting implements Parcelable { 
     * @return SKIP_464XLAT_DEFAULT, SKIP_464XLAT_DISABLE or SKIP_464XLAT_ENABLE

     * @hide

     */

    @Carriers.Skip464XlatStatus

    @Skip464XlatStatus

    public int getSkip464Xlat() {

        return mSkip464Xlat;

    }
@@ -2061,7 +2070,7 @@ public class ApnSetting implements Parcelable { 
         * @param skip464xlat skip464xlat for this APN

         * @hide

         */

        public Builder setSkip464Xlat(@Carriers.Skip464XlatStatus int skip464xlat) {

        public Builder setSkip464Xlat(@Skip464XlatStatus int skip464xlat) {

            this.mSkip464Xlat = skip464xlat;

            return this;

        }