commit 7d215078521ea03bbd692364e882d02ad065ced0
author paulhu <paulhu@google.com> Thu Apr 04 00:57:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 04 00:57:26 2019 -0700
tree 1a5bb62aafba87e400edbe54655c447035de8599
parent 8f0ba600baff96f88d87b708972ddcccf7719df4
parent ccc12f673bf4c2decfa2011b9a7098c04f6e28d9

Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340
am: ccc12f673b

Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e

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

diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
index da1360d..b6946023 100644
--- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java
+++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java
@@ -469,7 +469,10 @@
      */
     @VisibleForTesting
     void sendPackagePermissionsToNetd(SparseIntArray netdPermissionsAppIds) {
-
+        if (mNetd == null) {
+            Log.e(TAG, "Failed to get the netd service");
+            return;
+        }
         ArrayList<Integer> allPermissionAppIds = new ArrayList<>();
         ArrayList<Integer> internetPermissionAppIds = new ArrayList<>();
         ArrayList<Integer> updateStatsPermissionAppIds = new ArrayList<>();