Merge "Tethering: check if configManager is null" into nyc-mr1-dev (7d25ab7b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Tethering.java

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -405,12 +405,14 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
	// Check carrier config for entitlement checks		// Check carrier config for entitlement checks
	final CarrierConfigManager configManager = (CarrierConfigManager) mContext		final CarrierConfigManager configManager = (CarrierConfigManager) mContext
	.getSystemService(Context.CARRIER_CONFIG_SERVICE);		.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(		boolean isEntitlementCheckRequired = configManager.getConfig().getBoolean(
	CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL);		CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL);

	if (!isEntitlementCheckRequired) {		if (!isEntitlementCheckRequired) {
	return false;		return false;
	}		}
			}
	return (provisionApp.length == 2);		return (provisionApp.length == 2);
	}		}