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

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

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

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

Change-Id: I3013a83fa164c2cff17aa8de947f5cb413712f64
parents f4832dc3 7fc92f93

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

+1 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,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
@@ -921,6 +921,9 @@ public class DataConnectionTest extends TelephonyTest { 
        waitForMs(100);



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

        assertEquals(

                Collections.singleton(carrierConfigPkgUid),

                getNetworkCapabilities().getAccessUids());

    }



    @Test