Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71c63728 authored by paulhu's avatar paulhu Committed by android-build-merger
Browse files

Merge "Fix ConnectivityServiceTest fail." am: fa8fc653 

am: ccc12f67

Change-Id: I7896f6c47478df6f4b70b68da98694f4b0e1563f
parents f3c6f0e4 ccc12f67

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -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<>();