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

Commit 41ad850c authored by Calvin Pan's avatar Calvin Pan Committed by android-build-merger
Browse files

Merge "Add CarrierId column in TelephonyProvider" am: 1df5ca6a 

am: dfed97ba

Change-Id: I89d20cb9ca28ad4fb26fbbf5cf2ba81985fa71ba
parents f82d01d1 dfed97ba

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37270,6 +37270,7 @@ package android.provider { 
    field public static final java.lang.String AUTH_TYPE = "authtype";

    field public static final deprecated java.lang.String BEARER = "bearer";

    field public static final java.lang.String CARRIER_ENABLED = "carrier_enabled";

    field public static final java.lang.String CARRIER_ID = "carrier_id";

    field public static final android.net.Uri CONTENT_URI;

    field public static final java.lang.String CURRENT = "current";

    field public static final java.lang.String DEFAULT_SORT_ORDER = "name ASC";

telephony/java/android/provider/Telephony.java

+7 −0
Original line number Diff line number Diff line
@@ -3048,6 +3048,13 @@ public final class Telephony { 
        @SystemApi

        public static final int NO_SET_SET = 0;



        /**

         * A unique carrier id associated with this APN

         * {@see TelephonyManager#getSimCarrierId()}

         * <p>Type: STRING</p>

         */

        public static final String CARRIER_ID = "carrier_id";



    }



    /**