API review: rename CarrierIdentification to Carrier id
Bug: 73953797
Test: unit test
Change-Id: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
(cherry picked from commit 4281d0ff5755e04f3fa611953b88f32f5d262ab3)
Merged-in: Id89c9100e8963a3cb890ebec347e4aabcd5fd4b8
diff --git a/api/current.txt b/api/current.txt
index 01117c9..eb64cac 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -37535,11 +37535,11 @@
field public static final java.lang.String ADDRESS = "address";
}
- public static final class Telephony.CarrierIdentification implements android.provider.BaseColumns {
+ public static final class Telephony.CarrierId implements android.provider.BaseColumns {
method public static android.net.Uri getUriForSubscriptionId(int);
- field public static final java.lang.String CID = "carrier_id";
+ field public static final java.lang.String CARRIER_ID = "carrier_id";
+ field public static final java.lang.String CARRIER_NAME = "carrier_name";
field public static final android.net.Uri CONTENT_URI;
- field public static final java.lang.String NAME = "carrier_name";
}
public static final class Telephony.Carriers implements android.provider.BaseColumns {
diff --git a/services/core/java/com/android/server/updates/CarrierIdInstallReceiver.java b/services/core/java/com/android/server/updates/CarrierIdInstallReceiver.java
index 0450816..a123304 100644
--- a/services/core/java/com/android/server/updates/CarrierIdInstallReceiver.java
+++ b/services/core/java/com/android/server/updates/CarrierIdInstallReceiver.java
@@ -22,7 +22,6 @@
import android.content.Intent;
import android.net.Uri;
import android.provider.Telephony;
-import android.util.Log;
public class CarrierIdInstallReceiver extends ConfigUpdateInstallReceiver {
@@ -33,7 +32,7 @@
@Override
protected void postInstall(Context context, Intent intent) {
ContentResolver resolver = context.getContentResolver();
- resolver.update(Uri.withAppendedPath(Telephony.CarrierIdentification.All.CONTENT_URI,
+ resolver.update(Uri.withAppendedPath(Telephony.CarrierId.All.CONTENT_URI,
"update_db"), new ContentValues(), null, null);
}
}
diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index cb87d1f..fb52ff7 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -3356,23 +3356,23 @@
* 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 @@
* @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 @@
/**
* 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");
}
}
}