Revert "Disable IdletimerAddRemoveInterface test on >=5.10"
This reverts commit ac67f9348b78ad6a9876e72cf57c1818177a9bfd.
The Android Common Kernels [5.10+] now supports this.
Test: atest NetdBinderTest IdletimerControllerTest
Bug: 175745224
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4ff791cd455dc14106e329e7c29811495ce7bae7
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index d7bbe45..d1f1b9b 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -43,7 +43,6 @@
#include <openssl/base64.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <sys/utsname.h>
#include <android-base/file.h>
#include <android-base/format.h>
@@ -1236,16 +1235,6 @@
} // namespace
TEST_F(NetdBinderTest, IdletimerAddRemoveInterface) {
- // TODO(b/175745224): Temporarily disable idletimer test on >5.10 kernels
- utsname u;
- if (!uname(&u)) {
- unsigned long major, minor;
- char *p;
- major = strtoul(u.release, &p, 10);
- minor = strtoul(++p, NULL, 10);
- if (major > 5 || (major == 5 && minor >= 10)) return;
- }
-
// TODO: We will get error in if expectIdletimerInterfaceRuleNotExists if there are the same
// rule in the table. Because we only check the result after calling remove function. We might
// check the actual rule which is removed by our function (maybe compare the results between
