commit cd5d75a80dce583cc8eba6dda071631b2824770f
author Guobin Zhang <guobin.zhang@intel.com> Tue Mar 18 10:04:27 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 18 10:04:27 2014 -0700
tree a1085761c51ac1849b07f4a1a912c532f0bc7b65
parent db480947fd73e49f407968a30fa346bdc7885a04
parent 8b00d852f09c33fb0a30e8d870bc113e49971879

am 8b00d852: am eb7c71cd: am 82f92fa5: Adapt to netlink changes introduced in kernel v3.8

* commit '8b00d852f09c33fb0a30e8d870bc113e49971879':
  Adapt to netlink changes introduced in kernel v3.8

tests/tests/security/src/android/security/cts/VoldExploitTest.java

diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index d7f97ee..61bf862 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -245,7 +245,7 @@
         Set<Integer> retval = new HashSet<Integer>();
         for (List<String> i : netlink) {
             // The PID is in column 3
-            int pid = Integer.decode(i.get(2));
+            int pid = Long.decode(i.get(2)).intValue();
             if (new File("/proc/" + pid + "/cmdline").exists()) {
                 retval.add(pid);
             }