Merge "Update getSimCarrierId() document" am: 4e61079a4c (99fb86a5) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -10314,7 +10314,7 @@ public class TelephonyManager {
		* <p>To recognize a carrier (including MVNO) as a first-class identity, Android assigns each
		* carrier with a canonical integer a.k.a. carrier id. The carrier ID is an Android
		* platform-wide identifier for a carrier. AOSP maintains carrier ID assignments in
		* <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb">here</a>
		* <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb">here</a>
		*
		* <p>Apps which have carrier-specific configurations or business logic can use the carrier id
		* as an Android platform-wide identifier for carriers.
		@@ -10376,7 +10376,7 @@ public class TelephonyManager {
		*
		* <p>For carriers without fine-grained specific carrier ids, return {@link #getSimCarrierId()}
		* <p>Specific carrier ids are defined in the same way as carrier id
		* <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb">here</a>
		* <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb">here</a>
		* except each with a "parent" id linking to its top-level carrier id.
		*
		* @return Returns fine-grained carrier id of the current subscription.
		@@ -10425,7 +10425,7 @@ public class TelephonyManager {
		* This is used for fallback when configurations/logic for exact carrier id
		* {@link #getSimCarrierId()} are not found.
		*
		* Android carrier id table <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb">here</a>
		* Android carrier id table <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb">here</a>
		* can be updated out-of-band, its possible a MVNO (Mobile Virtual Network Operator) carrier
		* was not fully recognized and assigned to its MNO (Mobile Network Operator) carrier id
		* by default. After carrier id table update, a new carrier id was assigned. If apps don't
		@@ -10452,7 +10452,7 @@ public class TelephonyManager {
		* used for fallback when configurations/logic for exact carrier id {@link #getSimCarrierId()}
		* are not found.
		*
		* Android carrier id table <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb">here</a>
		* Android carrier id table <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb">here</a>
		* can be updated out-of-band, its possible a MVNO (Mobile Virtual Network Operator) carrier
		* was not fully recognized and assigned to its MNO (Mobile Network Operator) carrier id
		* by default. After carrier id table update, a new carrier id was assigned. If apps don't