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

Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev

Browse Source 
am: 56760c65df

* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
  Add carrier config key for carrier setup app.

Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59
This commit is contained in:
Stuart Scott
2016-06-06 20:17:20 +00:00
committed by android-build-merger
parent 265787fded 56760c65df
commit 027e2d204e
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -674,6 +674,21 @@ public class CarrierConfigManager {
public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl"; public static final String KEY_MMS_UA_PROF_URL_STRING = "uaProfUrl";
public static final String KEY_MMS_USER_AGENT_STRING = "userAgent"; public static final String KEY_MMS_USER_AGENT_STRING = "userAgent";
/**
* 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:
* <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
*/
public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string";
/** /**
* A list of component name of carrier signalling receivers which are interested in intent * A list of component name of carrier signalling receivers which are interested in intent
* android.intent.action.CARRIER_SIGNAL_REDIRECTED. * android.intent.action.CARRIER_SIGNAL_REDIRECTED.
@@ -887,6 +902,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY, null); sDefaults.putStringArray(KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_SIGNAL_DCFAILURE_RECEIVER_STRING_ARRAY, null); sDefaults.putStringArray(KEY_SIGNAL_DCFAILURE_RECEIVER_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_SIGNAL_PCO_RECEIVER_STRING_ARRAY, null); sDefaults.putStringArray(KEY_SIGNAL_PCO_RECEIVER_STRING_ARRAY, null);
sDefaults.putString(KEY_CARRIER_SETUP_APP_STRING, "");
} }
/** /**