commit 7d25ab7b11f95d7df1c078f2fc37ce122b61534e
author Paul Stewart <pstew@google.com> Tue Oct 04 23:17:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 04 23:17:13 2016 +0000
tree b8e89afaa4538d8c45baf023a23471d20873f29b
parent c65dc5529e72b8dfdb72b6d8739489ea68653000
parent b07f1409045091476e5296f9b0dd41c8712fe49a

Merge "Tethering: check if configManager is null" into nyc-mr1-dev

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

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 50faf3b..da9c547 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 @@
         // 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);
     }