diff options
author | Andres Celis <celisa@google.com> | 2017-10-21 00:36:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-21 00:36:02 +0000 |
commit | 8e308b2fe04697cc500bfb1c9ada02de2cf6711e (patch) | |
tree | 5992544442033fee05ce625a3f06a71e75038dc1 | |
parent | 0d5217c98b5537beed61fd05812832e79afafe16 (diff) | |
parent | 4188de907920bed915eb1bdf059220c4f72691c8 (diff) | |
download | cts-8e308b2fe04697cc500bfb1c9ada02de2cf6711e.tar.gz |
Merge "Fix for b/68051472" into nyc-dev am: 7d4643347f am: 1fe4b4022c am: 89d9036a9d am: 2d7a3dca17
am: 4188de9079
Change-Id: If56166169ae4ab18f0eda5a243b860982debb129
-rw-r--r-- | hostsidetests/security/src/android/security/cts/SecurityTestCase.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java index ff41e40e979..e137f57b727 100644 --- a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java +++ b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java @@ -35,8 +35,9 @@ public class SecurityTestCase extends DeviceTestCase { public void setUp() throws Exception { super.setUp(); + String uptime = getDevice().executeShellCommand("cat /proc/uptime"); kernelStartTime = System.currentTimeMillis()/1000 - - Integer.parseInt(getDevice().executeShellCommand("cut -f1 -d. /proc/uptime").trim()); + Integer.parseInt(uptime.substring(0, uptime.indexOf('.'))); //TODO:(badash@): Watch for other things to track. // Specifically time when app framework starts } @@ -82,9 +83,10 @@ public class SecurityTestCase extends DeviceTestCase { @Override public void tearDown() throws Exception { getDevice().waitForDeviceOnline(60 * 1000); + String uptime = getDevice().executeShellCommand("cat /proc/uptime"); assertTrue("Phone has had a hard reset", (System.currentTimeMillis()/1000 - - Integer.parseInt(getDevice().executeShellCommand("cut -f1 -d. /proc/uptime").trim()) + Integer.parseInt(uptime.substring(0, uptime.indexOf('.'))) - kernelStartTime < 2)); //TODO(badash@): add ability to catch runtime restart getDevice().disableAdbRoot(); |