Merge "Fix ConnectivityServiceTest fail."

am: 362d9fb687

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c
This commit is contained in:
paulhu
2019-04-03 17:24:39 -07:00
committed by android-build-merger

View File

@@ -469,7 +469,10 @@ public class PermissionMonitor {
*/ */
@VisibleForTesting @VisibleForTesting
void sendPackagePermissionsToNetd(SparseIntArray netdPermissionsAppIds) { void sendPackagePermissionsToNetd(SparseIntArray netdPermissionsAppIds) {
if (mNetd == null) {
Log.e(TAG, "Failed to get the netd service");
return;
}
ArrayList<Integer> allPermissionAppIds = new ArrayList<>(); ArrayList<Integer> allPermissionAppIds = new ArrayList<>();
ArrayList<Integer> internetPermissionAppIds = new ArrayList<>(); ArrayList<Integer> internetPermissionAppIds = new ArrayList<>();
ArrayList<Integer> updateStatsPermissionAppIds = new ArrayList<>(); ArrayList<Integer> updateStatsPermissionAppIds = new ArrayList<>();