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

Merge "new Systeam API for CarrierConfig#KEY_CARRIER_SETUP_APP_STRING"

Browse Source 
am: 8715c1545e

Change-Id: Ica9a2f2a7542739b500f8a4350ae40101bb0363b
This commit is contained in:
Chen Xu
2018-11-15 09:27:28 -08:00
committed by android-build-merger
parent b332c39954 8715c1545e
commit 2db64c2f55
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -5094,6 +5094,7 @@ package android.telephony {
method public static android.os.PersistableBundle getDefaultConfig(); method public static android.os.PersistableBundle getDefaultConfig();
method public void overrideConfig(int, android.os.PersistableBundle); method public void overrideConfig(int, android.os.PersistableBundle);
method public void updateConfigForPhoneId(int, java.lang.String); method public void updateConfigForPhoneId(int, java.lang.String);
field public static final java.lang.String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string"; field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";
} }

15
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1320,18 +1320,13 @@ public class CarrierConfigManager {
public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection"; public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection";
/** /**
* If carriers require differentiate un-provisioned status: cold sim or out of credit sim * The flatten {@link android.content.ComponentName componentName} of the activity that can
* a package name and activity name can be provided to launch a supported carrier application * setup the device and activate with the network per carrier requirements.
* that check the sim provisioning status *
* The first element is the package name and the second element is the activity name * e.g, com.google.android.carrierPackageName/.CarrierActivityName
* of the provisioning app
* example:
* <item>com.google.android.carrierPackageName</item>
* <item>com.google.android.carrierPackageName.CarrierActivityName</item>
* The ComponentName of the carrier activity that can setup the device and activate with the
* network as part of the Setup Wizard flow.
* @hide * @hide
*/ */
@SystemApi
public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string"; public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
/** /**