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

API review: rename CarrierIdentification to Carrier id

Browse Source 
Bug: 73953797
Test: unit test
Change-Id: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
(cherry picked from commit 4281d0ff57)
Merged-in: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
This commit is contained in:
fionaxu
2018-02-28 11:18:45 -08:00
parent 343c2157fc
commit 62bc747275
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telephony/java/android/provider/Telephony.java
View File

@@ -3356,23 +3356,23 @@ public final class Telephony {
* Contains carrier identification information for the current subscriptions.
* @see SubscriptionManager#getActiveSubscriptionIdList()
*/
public static final class CarrierIdentification implements BaseColumns {
public static final class CarrierId implements BaseColumns {
/**
* Not instantiable.
* @hide
*/
private CarrierIdentification() {}
private CarrierId() {}
/**
* The {@code content://} style URI for this provider.
*/
public static final Uri CONTENT_URI = Uri.parse("content://carrier_identification");
public static final Uri CONTENT_URI = Uri.parse("content://carrier_id");
/**
* The authority string for the CarrierIdentification Provider
* The authority string for the CarrierId Provider
* @hide
*/
public static final String AUTHORITY = "carrier_identification";
public static final String AUTHORITY = "carrier_id";
/**
@@ -3399,14 +3399,14 @@ public final class Telephony {
* @see TelephonyManager#getAndroidCarrierNameForSubscription()
* <P>Type: TEXT </P>
*/
public static final String NAME = "carrier_name";
public static final String CARRIER_NAME = "carrier_name";
/**
* A unique carrier id
* @see TelephonyManager#getAndroidCarrierIdForSubscription()
* <P>Type: INTEGER </P>
*/
public static final String CID = "carrier_id";
public static final String CARRIER_ID = "carrier_id";
/**
* Contains mappings between matching rules with carrier id for all carriers.
@@ -3464,7 +3464,7 @@ public final class Telephony {
/**
* The {@code content://} URI for this table.
*/
public static final Uri CONTENT_URI = Uri.parse("content://carrier_identification/all");
public static final Uri CONTENT_URI = Uri.parse("content://carrier_id/all");
}
}
}