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

Merge "API review: rename CarrierIdentification to Carrier id"

Browse Source 
am: f01600d5f9

Change-Id: Ic75f2037d277ccce95b24003b152159c9c37e4fc
This commit is contained in:
Chen Xu
2018-03-06 00:40:19 +00:00
committed by android-build-merger
parent 472ff2a79d f01600d5f9
commit ce7404744f
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -35554,11 +35554,11 @@ package android.provider {
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 {

3
services/core/java/com/android/server/updates/CarrierIdInstallReceiver.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
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 @@ public class CarrierIdInstallReceiver extends ConfigUpdateInstallReceiver {
@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);
}
}

16
telephony/java/android/telephony/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");
}
}
}