commit b8255ba21fbc12042e8d3deb811890d724503bd8
author Hui Wang <huiwang@google.com> Wed Feb 22 22:20:12 2023 +0000
committer Hui Wang <huiwang@google.com> Thu Mar 09 17:02:57 2023 +0000
tree 94ef22d5c3e513ebbab70b4d954a56eaf60603a3
parent c122093ea548503e12444ba56da6bfa7f5dd15a6

Update javadoc for CARRIER_ID to be used to match carrier info

Bug: 264916634
Test: make
Change-Id: Idaa31aedfe4996c45dddb0b287ac8106e3a3a0f0

core/java/android/provider/Telephony.java

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 6896e02..e59af66 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -3396,8 +3396,10 @@
         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";