commit bf08a6bcf9c8a1bcf3ea208fdc0d88aaf27263d2
author Alain Vongsouvanh <alainv@google.com> Thu May 14 06:30:21 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 14 06:30:21 2015 +0000
tree ce3c52ffd74ac333224ce8798ecc6728c78ea816
parent 9262daa909e3991c6fb644164eebcd5feaa06c48
parent ed5775098892e667d1fa3b5d625e2f1396468a58

Merge "Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand." into lollipop-cts-dev
automerge: ed57750

* commit 'ed5775098892e667d1fa3b5d625e2f1396468a58':
  Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand.

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 = ""