commit 2cda0cd2eb73d310af7be5f3373ece8820f8e4e7
author Alain Vongsouvanh <alainv@google.com> Thu Apr 30 08:32:49 2015 -0700
committer Alain Vongsouvanh <alainv@google.com> Tue May 12 10:43:35 2015 -0700
tree fe92e4f4d46c0a27e2590c2f915ded2ed4b872d1
parent 89c8f21c21b6e5552083ac95b86c8bebb781b9ce

Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand.

Using the pullFile method will prevent the android.host.security test suite to crash the device when the targeted files do not exist.

b/20165544

Change-Id: Ic3ebb1fb55646cd05efb6d0d94bc8a6eca636d06

hostsidetests/security/src/android/cts/security/SELinuxHostTest.java

diff --git a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
index 96845b1..c93295a 100644
--- a/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
+++ b/hostsidetests/security/src/android/cts/security/SELinuxHostTest.java
@@ -77,8 +77,7 @@
         /* obtain sepolicy file from running device */
         devicePolicyFile = File.createTempFile("sepolicy", ".tmp");
         devicePolicyFile.deleteOnExit();
-        mDevice.executeAdbCommand("pull", "/sys/fs/selinux/policy",
-                devicePolicyFile.getAbsolutePath());
+        mDevice.pullFile("/sys/fs/selinux/policy", devicePolicyFile);
     }
 
     /**

tools/selinux/SELinuxNeverallowTestFrame.py

diff --git a/tools/selinux/SELinuxNeverallowTestFrame.py b/tools/selinux/SELinuxNeverallowTestFrame.py
index 932014a..0bf766d 100644
--- a/tools/selinux/SELinuxNeverallowTestFrame.py
+++ b/tools/selinux/SELinuxNeverallowTestFrame.py
@@ -72,8 +72,7 @@
         /* obtain sepolicy file from running device */
         devicePolicyFile = File.createTempFile("sepolicy", ".tmp");
         devicePolicyFile.deleteOnExit();
-        mDevice.executeAdbCommand("pull", "/sys/fs/selinux/policy",
-                devicePolicyFile.getAbsolutePath());
+        mDevice.pullFile("/sys/fs/selinux/policy", devicePolicyFile);
     }
 """
 src_body = ""