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

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

Merge changes I5125755b,I312e55a5 into sc-dev am: 320acb12 

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

Change-Id: I872f1c7823177e2c28929a72458b8c8490390577
parents dd1f670a 320acb12

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

+4 −2
Original line number Diff line number Diff line
@@ -9694,7 +9694,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);
@@ -9999,7 +10000,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

+8 −6
Original line number Diff line number Diff line
@@ -10479,7 +10479,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));

    }
@@ -11693,10 +11693,12 @@ public class ConnectivityServiceTest { 
                mServiceContext, "internetFactory", internetFilter, mCsHandlerThread);

        internetFactory.setScoreFilter(40);

        internetFactory.register();

        // Default internet request & 3rd (fallback) request in OEM_PAID NRI. The unmetered request

        // is never sent to factories (it's a LISTEN, not requestable) and the OEM_PAID request

        // doesn't match the internetFactory filter.

        internetFactory.expectRequestAdds(2);

        // Default internet request only. The unmetered request is never sent to factories (it's a

        // LISTEN, not requestable). The 3rd (fallback) request in OEM_PAID NRI is TRACK_DEFAULT

        // which is also not sent to factories. Finally, the OEM_PAID request doesn't match the

        // internetFactory filter.

        internetFactory.expectRequestAdds(1);

        internetFactory.assertRequestCountEquals(1);















        NetworkCapabilities oemPaidFilter = new NetworkCapabilities()















                .addCapability(NET_CAPABILITY_INTERNET)









@@ -11719,7 +11721,7 @@ public class ConnectivityServiceTest {













        expectNoRequestChanged(oemPaidFactory);















        oemPaidFactory.assertRequestCountEquals(1);















        // The internet factory however is outscored, and should lose its requests.













        internetFactory.expectRequestRemoves(2);













        internetFactory.expectRequestRemove();















        internetFactory.assertRequestCountEquals(0);





























        final NetworkCapabilities oemPaidNc = new NetworkCapabilities();