commit 362d9fb68758a64ba8768a90828aa1f452b9ff0b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 03 23:54:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 03 23:54:38 2019 +0000
tree e60b9585e9b167c54bc340a984411dca9f647470
parent 92358214780fa206b92de8c1e982f53cf579d091
parent 451b1c86090304aaa47f782b14e0e2bb3552abee

Merge "Fix ConnectivityServiceTest fail."

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