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

Use destroyLiveTcpSocketsByOwnerUids for frozen apps

Browse Source 
Bug: 284900338
Test: FrameworksNetTests
Change-Id: Ia10f3c3b01c42d6ae5ba7b18786b66ca3209b108
This commit is contained in:
Motomu Utsumi
2023-05-30 11:43:52 +09:00
parent 1f8ba241f2
commit 588a64587d
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/com/android/server/ConnectivityService.java
View File

@@ -2986,19 +2986,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
private void handleFrozenUids(int[] uids, int[] frozenStates) { private void handleFrozenUids(int[] uids, int[] frozenStates) {
final ArraySet<Range<Integer>> ranges = new ArraySet<>(); final ArraySet<Integer> ownerUids = new ArraySet<>();
for (int i = 0; i < uids.length; i++) { for (int i = 0; i < uids.length; i++) {
if (frozenStates[i] == UID_FROZEN_STATE_FROZEN) { if (frozenStates[i] == UID_FROZEN_STATE_FROZEN) {
Integer uidAsInteger = Integer.valueOf(uids[i]); ownerUids.add(uids[i]);
ranges.add(new Range(uidAsInteger, uidAsInteger));
} }
} }
if (!ranges.isEmpty()) { if (!ownerUids.isEmpty()) {
final Set<Integer> exemptUids = new ArraySet<>();
try { try {
mDeps.destroyLiveTcpSockets(ranges, exemptUids); mDeps.destroyLiveTcpSocketsByOwnerUids(ownerUids);
} catch (Exception e) { } catch (Exception e) {
loge("Exception in socket destroy: " + e); loge("Exception in socket destroy: " + e);
} }

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

@@ -18513,12 +18513,7 @@ public class ConnectivityServiceTest {
waitForIdle(); waitForIdle();
final Set<Integer> exemptUids = new ArraySet(); verify(mDestroySocketsWrapper).destroyLiveTcpSocketsByOwnerUids(Set.of(TEST_FROZEN_UID));
final UidRange frozenUidRange = new UidRange(TEST_FROZEN_UID, TEST_FROZEN_UID);
final Set<UidRange> ranges = Collections.singleton(frozenUidRange);
verify(mDestroySocketsWrapper).destroyLiveTcpSockets(eq(UidRange.toIntRanges(ranges)),
eq(exemptUids));
} }
@Test @Test