am 2beeeecd: am dbb5ace6: VoldExploitTest: Don\'t timeout on slow netlink receivers
* commit '2beeeecdfb0ca3a35ed13b6dc7bfc24fbce20098':
VoldExploitTest: Don't timeout on slow netlink receivers
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index ab14f12..d4ea884 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -269,12 +269,18 @@
/**
* Poll /proc/net/netlink until all the "Rmem" fields contain
- * "0". This indicates that there are no outstanding unreceived
- * netlink messages.
+ * "0" or approximately 10 seconds have passed.
+ *
+ * This indicates that either the netlink message was received,
+ * or the process took too long to process the incoming netlink
+ * message.
+ *
+ * See http://code.google.com/p/android/issues/detail?id=25099
+ * for information on why the timeout is needed.
*/
private static void confirmNetlinkMsgReceived() {
try {
- while(true) {
+ for (int ct = 0; ct < 200; ct++) {
boolean foundAllZeros = true;
for (List<String> i : parseNetlink()) {
// Column 5 is the "Rmem" field, which is the