commit ccc12f673bf4c2decfa2011b9a7098c04f6e28d9
author paulhu <paulhu@google.com> Wed Apr 03 17:24:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 17:24:39 2019 -0700
tree 7f8086823c3da4a1269161c9547906363ba11a9f
parent 279a924fdf70280be0ae83bba7859012edcd04aa
parent fa8fc6534090799f9e7824f20c54f927362a3b61

Merge "Fix ConnectivityServiceTest fail."
am: fa8fc65340

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c

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<>();