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

Commit f07b0c77 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Add Access UIDs" am: 7e9f7be3 am: 2181b619 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1960859

Change-Id: I2727f804b66701e5ad6ba5d331d7d902398d5afb
parents efdeaa78 2181b619

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ public class DataConnection extends StateMachine { 
        if (carrierServicePackageUid != Process.INVALID_UID

                && ArrayUtils.contains(mAdministratorUids, carrierServicePackageUid)) {

            builder.setOwnerUid(carrierServicePackageUid);

            // TODO: If carrier-restricted, add appropriate INTERNAL_NETWORK and AccessUids

            builder.setAccessUids(Collections.singleton(carrierServicePackageUid));

        }

        builder.setAdministratorUids(mAdministratorUids);

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+3 −0
Original line number Diff line number Diff line
@@ -920,6 +920,9 @@ public class DataConnectionTest extends TelephonyTest { 
        waitForMs(100);



        assertEquals(carrierConfigPkgUid, getNetworkCapabilities().getOwnerUid());

        assertEquals(

                Collections.singleton(carrierConfigPkgUid),

                getNetworkCapabilities().getAccessUids());

    }



    @Test