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

Commit b1466609 authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Changing per-app default request to TRACK_DEFAULT" am: bc4ca04c am: 7bdd8f85 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I16f4bc417880aeef53a17cb1830666b5fefe5889
parents 8a46fb77 7bdd8f85

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

+4 −2
Original line number Diff line number Diff line
@@ -9593,7 +9593,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // request.

            final ArrayList<NetworkRequest> nrs = new ArrayList<>();

            nrs.add(createNetworkRequest(NetworkRequest.Type.REQUEST, pref.capabilities));

            nrs.add(createDefaultRequest());

            nrs.add(createDefaultInternetRequestForTransport(

                    TYPE_NONE, NetworkRequest.Type.TRACK_DEFAULT));

            setNetworkRequestUids(nrs, UidRange.fromIntRanges(pref.capabilities.getUids()));

            final NetworkRequestInfo nri = new NetworkRequestInfo(Process.myUid(), nrs);

            result.add(nri);
@@ -9898,7 +9899,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                case OemNetworkPreferences.OEM_NETWORK_PREFERENCE_OEM_PAID:

                    requests.add(createUnmeteredNetworkRequest());

                    requests.add(createOemPaidNetworkRequest());

                    requests.add(createDefaultRequest());

                    requests.add(createDefaultInternetRequestForTransport(

                            TYPE_NONE, NetworkRequest.Type.TRACK_DEFAULT));

                    break;

                case OemNetworkPreferences.OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK:

                    requests.add(createUnmeteredNetworkRequest());

tests/net/java/com/android/server/ConnectivityServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -10323,7 +10323,7 @@ public class ConnectivityServiceTest { 
        assertTrue(mRequests.get(0).hasCapability(NET_CAPABILITY_VALIDATED));

        assertTrue(mRequests.get(1).isRequest());

        assertTrue(mRequests.get(1).hasCapability(NET_CAPABILITY_OEM_PAID));

        assertTrue(mRequests.get(2).isRequest());

        assertEquals(NetworkRequest.Type.TRACK_DEFAULT, mRequests.get(2).type);

        assertTrue(mService.getDefaultRequest().networkCapabilities.equalsNetCapabilities(

                mRequests.get(2).networkCapabilities));

    }