Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tethering: check if configManager is null

Browse Source 
am: b07f140904

Change-Id: I71abfd9d6c91bbc3b3b2b3689756d3dd6818ac1e
This commit is contained in:
Rebecca Silberstein
2016-10-06 20:34:26 +00:00
committed by android-build-merger
parent 2c1a026ee5 b07f140904
commit 7aca691f27
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -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);
} }