LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Changing automotive ethernet allowed UIDs check" am: 36cae536f0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2101472

Change-Id: I636480fe8b9788dba91b7f2d39071cbaabfbd2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-05-19 13:58:41 +00:00
committed by Automerger Merge Worker
parent 253a2403f7 36cae536f0
commit fe4f42ff48
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/com/android/server/connectivity/NetworkAgentInfo.java
View File

@@ -1256,7 +1256,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo>, NetworkRa
if (nc.hasTransport(TRANSPORT_TEST)) return true; if (nc.hasTransport(TRANSPORT_TEST)) return true;
// Factories that make ethernet networks can allow UIDs for automotive devices. // Factories that make ethernet networks can allow UIDs for automotive devices.
if (nc.hasTransport(TRANSPORT_ETHERNET) && hasAutomotiveFeature) { if (nc.hasSingleTransport(TRANSPORT_ETHERNET) && hasAutomotiveFeature) {
return true; return true;
} }

8
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -15536,7 +15536,7 @@ public class ConnectivityServiceTest {
mEthernetNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_ETHERNET, mEthernetNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_ETHERNET,
new LinkProperties(), agentNetCaps.build()); new LinkProperties(), agentNetCaps.build());
validateAllowedUids(mEthernetNetworkAgent, TRANSPORT_ETHERNET, agentNetCaps); validateAllowedUids(mEthernetNetworkAgent, TRANSPORT_ETHERNET, agentNetCaps, true);
} }
@Test @Test
@@ -15560,12 +15560,12 @@ public class ConnectivityServiceTest {
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR,
new LinkProperties(), agentNetCaps.build()); new LinkProperties(), agentNetCaps.build());
validateAllowedUids(mCellNetworkAgent, TRANSPORT_CELLULAR, agentNetCaps); validateAllowedUids(mCellNetworkAgent, TRANSPORT_CELLULAR, agentNetCaps, false);
} }
private void validateAllowedUids(final TestNetworkAgentWrapper testAgent, private void validateAllowedUids(final TestNetworkAgentWrapper testAgent,
@NetworkCapabilities.Transport final int transportUnderTest, @NetworkCapabilities.Transport final int transportUnderTest,
final NetworkCapabilities.Builder ncb) throws Exception { final NetworkCapabilities.Builder ncb, final boolean forAutomotive) throws Exception {
final ArraySet<Integer> serviceUidSet = new ArraySet<>(); final ArraySet<Integer> serviceUidSet = new ArraySet<>();
serviceUidSet.add(TEST_PACKAGE_UID); serviceUidSet.add(TEST_PACKAGE_UID);
final ArraySet<Integer> nonServiceUidSet = new ArraySet<>(); final ArraySet<Integer> nonServiceUidSet = new ArraySet<>();
@@ -15595,7 +15595,7 @@ public class ConnectivityServiceTest {
} }
/* Test setting UIDs is rejected when expected */ /* Test setting UIDs is rejected when expected */
if (TRANSPORT_ETHERNET == transportUnderTest) { if (forAutomotive) {
mockHasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, false); mockHasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, false);
} }