Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e4dbf0 authored by Rebecca Silberstein's avatar Rebecca Silberstein Committed by android-build-merger
Browse files

Merge "Tethering: check if configManager is null"

am: e011bf80

Change-Id: I4aae5973e9b3efc4cf9e0ae6dd15f4b6871d87e3
parents 951dca82 e011bf80
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -404,12 +404,14 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
        // Check carrier config for entitlement checks
        final CarrierConfigManager configManager = (CarrierConfigManager) mContext
             .getSystemService(Context.CARRIER_CONFIG_SERVICE);
        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);
    }