Merge "Fix ConnectivityServiceTest fail." am: 4116929c12 am: 3527957a9f

am: e77aa6c76b

Change-Id: I0230ea353a91283328c8df06ca5a89af99c40468

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

@@ -469,7 +469,10 @@ public class PermissionMonitor {
      */
     @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<>();