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

Commit 1df5ca6a authored by Calvin Pan's avatar Calvin Pan Committed by Gerrit Code Review
Browse files

Merge "Add CarrierId column in TelephonyProvider"

parents c6b17ad4 3689c969

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
@@ -2995,6 +2995,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";



    }



    /**