diff options
author | Chris Manton <cmanton@google.com> | 2015-09-14 17:39:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-14 17:39:31 +0000 |
commit | f40365f17a2f01612139e909039a09308001fdde (patch) | |
tree | 503f0d470786a8ca78f503dffc65a1675774b87e /packages/SettingsLib | |
parent | 12e273fe76f1f0e6b5cffb687da7411d73dfe7c6 (diff) | |
parent | ae0b7ca9ad2e21853af06a68c02da068f748f8bd (diff) | |
download | frameworks_base-f40365f17a2f01612139e909039a09308001fdde.zip frameworks_base-f40365f17a2f01612139e909039a09308001fdde.tar.gz frameworks_base-f40365f17a2f01612139e909039a09308001fdde.tar.bz2 |
am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
* commit 'ae0b7ca9ad2e21853af06a68c02da068f748f8bd':
Add capability to ignore carrier entitlement checks
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/TetherUtil.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java index 5062423..5294199 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java @@ -25,6 +25,7 @@ import android.net.wifi.WifiManager; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; +import android.telephony.CarrierConfigManager; public class TetherUtil { @@ -62,6 +63,13 @@ public class TetherUtil { return wifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED; } + private static boolean isEntitlementCheckRequired(Context context) { + final CarrierConfigManager configManager = (CarrierConfigManager) context + .getSystemService(Context.CARRIER_CONFIG_SERVICE); + return configManager.getConfig().getBoolean(CarrierConfigManager + .KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL); + } + public static boolean isProvisioningNeeded(Context context) { // Keep in sync with other usage of config_mobile_hotspot_provision_app. // ConnectivityManager#enforceTetherChangePermission @@ -71,6 +79,10 @@ public class TetherUtil { || provisionApp == null) { return false; } + // Check carrier config for entitlement checks + if (isEntitlementCheckRequired(context) == false) { + return false; + } return (provisionApp.length == 2); } |