From d040f2d785b8a6d05b076de15b60edfdcc5dada7 Mon Sep 17 00:00:00 2001 From: chen xu Date: Sat, 10 Nov 2018 10:54:45 -0800 Subject: [PATCH] new Systeam API for CarrierConfig#KEY_CARRIER_SETUP_APP_STRING SuW will consume this config and launches a carrier app to setup the device or provision the SIM. Bug: 119229895 Test: telephony unit test Change-Id: Ibc3cc9913c20fd367f83854765a8aea378bb6622 --- api/system-current.txt | 1 + .../android/telephony/CarrierConfigManager.java | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index c901e34f4061c..e95442f21f4bc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5088,6 +5088,7 @@ package android.telephony { method public static android.os.PersistableBundle getDefaultConfig(); method public void overrideConfig(int, android.os.PersistableBundle); 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"; } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 0280a759e943c..8553ac34bd398 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1329,18 +1329,13 @@ public class CarrierConfigManager { public static final String KEY_MMS_CLOSE_CONNECTION_BOOL = "mmsCloseConnection"; /** - * If carriers require differentiate un-provisioned status: cold sim or out of credit sim - * a package name and activity name can be provided to launch a supported carrier application - * that check the sim provisioning status - * The first element is the package name and the second element is the activity name - * of the provisioning app - * example: - * com.google.android.carrierPackageName - * com.google.android.carrierPackageName.CarrierActivityName - * The ComponentName of the carrier activity that can setup the device and activate with the - * network as part of the Setup Wizard flow. + * The flatten {@link android.content.ComponentName componentName} of the activity that can + * setup the device and activate with the network per carrier requirements. + * + * e.g, com.google.android.carrierPackageName/.CarrierActivityName * @hide */ + @SystemApi public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string"; /**