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

Commit 3f7cdf4a authored by Chalard Jean's avatar Chalard Jean Committed by Sooraj Sasindran
Browse files

Rename setAccessUids to setAllowedUids 

Bug: 217725769
Test: ConnectivityServiceTest CtsNetTestCases
Change-Id: I0704eeebc2d74a338d23a57e1313df864c84a17f
parent fc0a2e37

src/java/com/android/internal/telephony/data/DataNetwork.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1625,7 +1625,7 @@ public class DataNetwork extends StateMachine { 
        if (mCarrierServicePackageUid != Process.INVALID_UID

        if (mCarrierServicePackageUid != Process.INVALID_UID

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

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

            builder.setOwnerUid(mCarrierServicePackageUid);

            builder.setOwnerUid(mCarrierServicePackageUid);

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

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

        }

        }

        builder.setAdministratorUids(mAdministratorUids);

        builder.setAdministratorUids(mAdministratorUids);

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

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

        if (carrierServicePackageUid != Process.INVALID_UID

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

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

            builder.setOwnerUid(carrierServicePackageUid);

            builder.setOwnerUid(carrierServicePackageUid);

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

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

        }

        }

        builder.setAdministratorUids(mAdministratorUids);

        builder.setAdministratorUids(mAdministratorUids);

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

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

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

        assertEquals(

        assertEquals(

                Collections.singleton(carrierConfigPkgUid),

                Collections.singleton(carrierConfigPkgUid),

                getNetworkCapabilities().getAccessUids());

                getNetworkCapabilities().getAllowedUids());

    }

    }





    @Test

    @Test