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

Merge "Remove debug log from NetworkStatsService"

Browse Source
This commit is contained in:
Aaron Huang
2022-06-09 02:37:42 +00:00
committed by Gerrit Code Review
parent 2111cc0749 de99c7a9f4
commit bd96778236
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service-t/src/com/android/server/net/NetworkStatsService.java
View File

@@ -1597,11 +1597,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public String[] getMobileIfaces() { public String[] getMobileIfaces() {
// TODO (b/192758557): Remove debug log.
if (CollectionUtils.contains(mMobileIfaces, null)) {
throw new NullPointerException(
"null element in mMobileIfaces: " + Arrays.toString(mMobileIfaces));
}
return mMobileIfaces.clone(); return mMobileIfaces.clone();
} }
@@ -2072,11 +2067,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
mMobileIfaces = mobileIfaces.toArray(new String[0]); mMobileIfaces = mobileIfaces.toArray(new String[0]);
// TODO (b/192758557): Remove debug log.
if (CollectionUtils.contains(mMobileIfaces, null)) {
throw new NullPointerException(
"null element in mMobileIfaces: " + Arrays.toString(mMobileIfaces));
}
} }
private static int getSubIdForMobile(@NonNull NetworkStateSnapshot state) { private static int getSubIdForMobile(@NonNull NetworkStateSnapshot state) {

22
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View File

@@ -140,6 +140,17 @@ import com.android.testutils.HandlerUtils;
import com.android.testutils.TestBpfMap; import com.android.testutils.TestBpfMap;
import com.android.testutils.TestableNetworkStatsProviderBinder; import com.android.testutils.TestableNetworkStatsProviderBinder;
import libcore.testing.io.TestIoUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.io.File; import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@@ -153,17 +164,6 @@ import java.util.Objects;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import libcore.testing.io.TestIoUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
/** /**
* Tests for {@link NetworkStatsService}. * Tests for {@link NetworkStatsService}.
* *