Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68986635 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "add install action for carrier id to system API" into pi-dev

parents b9790fd1 2776ed56

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3663,6 +3663,7 @@ package android.os { 
  }



  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_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";

core/java/android/os/ConfigUpdate.java

+8 −0
Original line number Diff line number Diff line
@@ -90,6 +90,14 @@ public final class ConfigUpdate { 
    public static final String ACTION_UPDATE_NETWORK_WATCHLIST

            = "android.intent.action.UPDATE_NETWORK_WATCHLIST";



    /**

     * 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() {

    }

}

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4262,7 +4262,7 @@ 
        <receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"

                  android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="com.android.internal.intent.action.UPDATE_CARRIER_ID_DB" />

                <action android:name="android.os.action.UPDATE_CARRIER_ID_DB" />

                <data android:scheme="content" android:host="*" android:mimeType="*/*" />

            </intent-filter>

        </receiver>