Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I9314481b4e03f2bc057637b89264919699a1fc7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hui Wang
2023-03-09 18:59:11 +00:00
committed by Automerger Merge Worker
parent 55af7ba066 b6af8a7849
commit 85003272f2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Telephony.java
View File

@@ -3396,8 +3396,10 @@ public final class Telephony {
public static final int MATCH_ALL_APN_SET_ID = -1; public static final int MATCH_ALL_APN_SET_ID = -1;
/** /**
* A unique carrier id associated with this APN * A unique carrier id associated with this APN {@link TelephonyManager#getSimCarrierId()}
* {@see 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> * <p>Type: STRING</p>
*/ */
public static final String CARRIER_ID = "carrier_id"; public static final String CARRIER_ID = "carrier_id";