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

Merge "Add a new carrier config to show the WFC location privacy policy UI"

Browse Source 
am: 4c508d1b03

Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
This commit is contained in:
Hall Liu
2019-04-01 16:34:30 -07:00
committed by android-build-merger
parent 39a6d731bb 4c508d1b03
commit d94791b712
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2523,6 +2523,14 @@ public class CarrierConfigManager {
public static final String KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY =
"cdma_enhanced_roaming_indicator_for_home_network_int_array";
/**
* Determines whether wifi calling location privacy policy is shown.
*
* @hide
*/
public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL =
"show_wfc_location_privacy_policy_bool";
/**
* This configuration allow the system UI to display different 5G icon for different 5G status.
*
@@ -2931,6 +2939,7 @@ public class CarrierConfigManager {
1 /* Roaming Indicator Off */
});
sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);
sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, true);
sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,
"connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");
sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, false);