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

Commit 39e47447 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename setAccessUids to setAllowedUids" into tm-dev am: cdf54adc 

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

Change-Id: I9fbd2d493bd891abb60db1c7f27e954257f277d6
parents fc2b1580 cdf54adc

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

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

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

            builder.setOwnerUid(mCarrierServicePackageUid);

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

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

        }

        builder.setAdministratorUids(mAdministratorUids);

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
@@ -929,7 +929,7 @@ public class DataConnectionTest extends TelephonyTest { 
        assertEquals(carrierConfigPkgUid, getNetworkCapabilities().getOwnerUid());

        assertEquals(

                Collections.singleton(carrierConfigPkgUid),

                getNetworkCapabilities().getAccessUids());

                getNetworkCapabilities().getAllowedUids());

    }



    @Test