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

Commit 2f8514a4 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 5b5d442e 

Change-Id: I6769788d7c0fade7bcab912c6a68f91161b25992
parents 43b81de8 5b5d442e

services/core/java/com/android/server/ConnectivityService.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -7909,8 +7909,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            @NonNull ConnectivityReportEvent reportEvent, @NonNull PersistableBundle extras) {

            @NonNull ConnectivityReportEvent reportEvent, @NonNull PersistableBundle extras) {

        final NetworkAgentInfo nai = reportEvent.mNai;

        final NetworkAgentInfo nai = reportEvent.mNai;

        final NetworkCapabilities networkCapabilities =

        final NetworkCapabilities networkCapabilities =

                new NetworkCapabilities(nai.networkCapabilities);

                getNetworkCapabilitiesWithoutUids(nai.networkCapabilities);

        clearNetworkCapabilitiesUids(networkCapabilities);

        final ConnectivityReport report =

        final ConnectivityReport report =

                new ConnectivityReport(

                new ConnectivityReport(

                        reportEvent.mNai.network,

                        reportEvent.mNai.network,
@@ -7934,8 +7933,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            @NonNull NetworkAgentInfo nai, long timestampMillis, int detectionMethod,

            @NonNull NetworkAgentInfo nai, long timestampMillis, int detectionMethod,

            @NonNull PersistableBundle extras) {

            @NonNull PersistableBundle extras) {

        final NetworkCapabilities networkCapabilities =

        final NetworkCapabilities networkCapabilities =

                new NetworkCapabilities(nai.networkCapabilities);

                getNetworkCapabilitiesWithoutUids(nai.networkCapabilities);

        clearNetworkCapabilitiesUids(networkCapabilities);

        final DataStallReport report =

        final DataStallReport report =

                new DataStallReport(

                new DataStallReport(

                        nai.network,

                        nai.network,
@@ -7968,10 +7966,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        }

    }

    }





    private void clearNetworkCapabilitiesUids(@NonNull NetworkCapabilities nc) {

    private NetworkCapabilities getNetworkCapabilitiesWithoutUids(@NonNull NetworkCapabilities nc) {

        nc.setUids(null);

        final NetworkCapabilities sanitized = new NetworkCapabilities(nc);

        nc.setAdministratorUids(new int[0]);

        sanitized.setUids(null);

        nc.setOwnerUid(Process.INVALID_UID);

        sanitized.setAdministratorUids(new int[0]);

        sanitized.setOwnerUid(Process.INVALID_UID);

        return sanitized;

    }

    }





    private List<IConnectivityDiagnosticsCallback> getMatchingPermissionedCallbacks(

    private List<IConnectivityDiagnosticsCallback> getMatchingPermissionedCallbacks(