From b8255ba21fbc12042e8d3deb811890d724503bd8 Mon Sep 17 00:00:00 2001
From: Hui Wang <huiwang@google.com>
Date: Wed, 22 Feb 2023 22:20:12 +0000
Subject: [PATCH] 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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 6896e02447917..e59af66845b49 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -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";