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

Merge "add install action for carrier id to system API"

Browse Source
This commit is contained in:
Treehugger Robot
2018-05-11 17:36:24 +00:00
committed by Gerrit Code Review
parent cdb29f97db 4ff8de609b
commit 87a7c657bd
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -3151,6 +3151,7 @@ package android.nfc {
package android.os { package android.os {
public final class ConfigUpdate { public final class ConfigUpdate {
field public static final java.lang.String ACTION_UPDATE_CARRIER_ID_DB = "android.os.action.UPDATE_CARRIER_ID_DB";
field public static final java.lang.String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS"; field public static final java.lang.String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";
field public static final java.lang.String ACTION_UPDATE_CT_LOGS = "android.intent.action.UPDATE_CT_LOGS"; field public static final java.lang.String ACTION_UPDATE_CT_LOGS = "android.intent.action.UPDATE_CT_LOGS";
field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL"; field public static final java.lang.String ACTION_UPDATE_INTENT_FIREWALL = "android.intent.action.UPDATE_INTENT_FIREWALL";

8
core/java/android/os/ConfigUpdate.java
View File

@@ -89,6 +89,14 @@ public final class ConfigUpdate {
public static final String ACTION_UPDATE_SMART_SELECTION public static final String ACTION_UPDATE_SMART_SELECTION
= "android.intent.action.UPDATE_SMART_SELECTION"; = "android.intent.action.UPDATE_SMART_SELECTION";
/**
* Update carrier id config file.
* @hide
*/
@SystemApi
public static final String ACTION_UPDATE_CARRIER_ID_DB
= "android.os.action.UPDATE_CARRIER_ID_DB";
private ConfigUpdate() { private ConfigUpdate() {
} }
} }

8
core/res/AndroidManifest.xml
View File

@@ -3898,6 +3898,14 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"
android:permission="android.permission.UPDATE_CONFIG">
<intent-filter>
<action android:name="android.os.action.UPDATE_CARRIER_ID_DB" />
<data android:scheme="content" android:host="*" android:mimeType="*/*" />
</intent-filter>
</receiver>
<receiver android:name="com.android.server.MasterClearReceiver" <receiver android:name="com.android.server.MasterClearReceiver"
android:permission="android.permission.MASTER_CLEAR"> android:permission="android.permission.MASTER_CLEAR">
<intent-filter <intent-filter