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

Commit 927810c4 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Rename setAccessUids to setAllowedUids" am: e435ee97 

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

Change-Id: I72db2f3c65a7cd894fd6c7cd48594c823f44e66d
parents 1c6b6292 e435ee97

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);

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

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

        }

        builder.setAdministratorUids(mAdministratorUids);

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

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ public class DataConnectionTest extends TelephonyTest { 
        assertEquals(carrierConfigPkgUid, getNetworkCapabilities().getOwnerUid());

        assertEquals(

                Collections.singleton(carrierConfigPkgUid),

                getNetworkCapabilities().getAccessUids());

                getNetworkCapabilities().getAllowedUids());

    }



    @Test