diff options
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Tethering.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index 50faf3b72a47..da9c5474b66b 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -405,11 +405,13 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering // Check carrier config for entitlement checks final CarrierConfigManager configManager = (CarrierConfigManager) mContext .getSystemService(Context.CARRIER_CONFIG_SERVICE); - boolean isEntitlementCheckRequired = configManager.getConfig().getBoolean( - CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL); - - if (!isEntitlementCheckRequired) { - return false; + if (configManager != null && configManager.getConfig() != null) { + // we do have a CarrierConfigManager and it has a config. + boolean isEntitlementCheckRequired = configManager.getConfig().getBoolean( + CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL); + if (!isEntitlementCheckRequired) { + return false; + } } return (provisionApp.length == 2); } |