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

Commit 23a68a5a authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for CARRIER_ID to be used to match carrier info" into... 

Merge "Update javadoc for CARRIER_ID to be used to match carrier info" into udc-dev am: b6af8a78 am: 85003272

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



Change-Id: Ie59cac4a3fe1f9181529280b7cc32ab0816125f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc1991a5 85003272

core/java/android/provider/Telephony.java

+4 −2
Original line number Diff line number Diff line
@@ -3396,8 +3396,10 @@ public final class Telephony { 
        public static final int MATCH_ALL_APN_SET_ID = -1;



        /**

         * A unique carrier id associated with this APN

         * {@see TelephonyManager#getSimCarrierId()}

         * A unique carrier id associated with this APN {@link TelephonyManager#getSimCarrierId()}

         * In case of matching carrier information, this should be used by default instead of

         * those fields of {@link #MCC}, {@link #MNC}, {@link #NUMERIC}, {@link #MVNO_TYPE},

         * {@link #MVNO_MATCH_DATA}, etc.

         * <p>Type: STRING</p>

         */

        public static final String CARRIER_ID = "carrier_id";