From 7682298a7df036d6f0c7d1d8741df4e7c466c4d6 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Fri, 2 Sep 2011 15:36:33 -0700 Subject: [PATCH] NetworkManagement SocketTagger: Migrate QTagUid support to JNI. * Instead of javaland trying to write commands to /proc/net/xt_qtaguid/ctrl use the libcutils/qtaguid.c support via JNI. * Get rid of tagToKernel() handled by qtaguid library. Requires libcutils changes from c/132538/ Change-Id: I9de5b3fa4a596c56835024c6d376769a0eea7db1 --- .../com/android/server/NetworkManagementServiceTest.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java index 2a258661cf..ab1597c674 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java @@ -21,7 +21,6 @@ import static android.net.NetworkStats.SET_FOREGROUND; import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkStats.UID_ALL; import static com.android.server.NetworkManagementSocketTagger.kernelToTag; -import static com.android.server.NetworkManagementSocketTagger.tagToKernel; import android.content.res.Resources; import android.net.NetworkStats; @@ -144,12 +143,6 @@ public class NetworkManagementServiceTest extends AndroidTestCase { } public void testKernelTags() throws Exception { - assertEquals("0", tagToKernel(0x0)); - assertEquals("214748364800", tagToKernel(0x32)); - assertEquals("9223372032559808512", tagToKernel(Integer.MAX_VALUE)); - assertEquals("0", tagToKernel(Integer.MIN_VALUE)); - assertEquals("9223369837831520256", tagToKernel(Integer.MIN_VALUE - 512)); - assertEquals(0, kernelToTag("0x0000000000000000")); assertEquals(0x32, kernelToTag("0x0000003200000000")); assertEquals(2147483647, kernelToTag("0x7fffffff00000000"));