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

Merge "Only make a subset of Call Barring options visible per carrier" into pi-dev

Browse Source
This commit is contained in:
Brad Ebinger
2018-10-01 22:36:06 +00:00
committed by Android (Google) Code Review
parent 46bdacd22f 137ba49bc5
commit 18ee267409
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,28 @@ public class CarrierConfigManager {
public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = public static final String KEY_CALL_BARRING_VISIBILITY_BOOL =
"call_barring_visibility_bool"; "call_barring_visibility_bool";
/**
* Flag indicating whether or not changing the call barring password via the "Call Barring"
* settings menu is supported. If true, the option will be visible in the "Call
* Barring" settings menu. If false, the option will not be visible.
*
* Enabled by default.
* @hide
*/
public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL =
"call_barring_supports_password_change_bool";
/**
* Flag indicating whether or not deactivating all call barring features via the "Call Barring"
* settings menu is supported. If true, the option will be visible in the "Call
* Barring" settings menu. If false, the option will not be visible.
*
* Enabled by default.
* @hide
*/
public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL =
"call_barring_supports_deactivate_all_bool";
/** /**
* Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED * Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED
* events from the Sim. * events from the Sim.
@@ -2095,6 +2117,8 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);
sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false); sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);
sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);
sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);
sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true);