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

Merge "Tethering: check if configManager is null" am: e011bf80c5

Browse Source 
am: d1e4dbf002

Change-Id: I635dbc1b89c7e7458344f29979d5e62b37e2dd67
This commit is contained in:
Rebecca Silberstein
2016-10-13 14:24:19 +00:00
committed by android-build-merger
parent 0ab9a078e9 d1e4dbf002
commit d33a0ee710
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,11 +404,13 @@ 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);
boolean isEntitlementCheckRequired = configManager.getConfig().getBoolean( if (configManager != null && configManager.getConfig() != null) {
CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL); // we do have a CarrierConfigManager and it has a config.
boolean isEntitlementCheckRequired = configManager.getConfig().getBoolean(
if (!isEntitlementCheckRequired) { CarrierConfigManager.KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL);
return false; if (!isEntitlementCheckRequired) {
return false;
}
} }
return (provisionApp.length == 2); return (provisionApp.length == 2);
} }