summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorChris Manton <cmanton@google.com>2015-09-14 17:29:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-14 17:29:09 +0000
commitae0b7ca9ad2e21853af06a68c02da068f748f8bd (patch)
treeeb2fb9da368b1ba9c4bb3009cc1416491ddbc9a9 /telephony/java
parentf66e4979c579bde5031c8e6f29e5163246fc54ee (diff)
parentc9180528452d67359618eda4aa2edd39112c83ca (diff)
downloadframeworks_base-ae0b7ca9ad2e21853af06a68c02da068f748f8bd.zip
frameworks_base-ae0b7ca9ad2e21853af06a68c02da068f748f8bd.tar.gz
frameworks_base-ae0b7ca9ad2e21853af06a68c02da068f748f8bd.tar.bz2
am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit 'c9180528452d67359618eda4aa2edd39112c83ca': Add capability to ignore carrier entitlement checks
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 98f7dd2..ef730fc 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -78,6 +78,15 @@ public class CarrierConfigManager {
public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
/**
+ * Flag to require or skip entitlement checks.
+ * If true, entitlement checks will be executed if device has been configured for it,
+ * If false, entitlement checks will be skipped.
+ * @hide
+ */
+ public static final String
+ KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";
+
+ /**
* If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity.
* The pattern is set on a per-platform basis using config_virtualKeyVibePattern. To be
* consistent with the regular Dialer, this value should agree with the corresponding values
@@ -495,6 +504,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false);
sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);
sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);
+ sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true);
sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);
sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, "");
sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");