Fix for b/68051472
Bug:68051472
Change-Id: Ic5dd9446f3b827900715fa30fcc98057db73fc2e
diff --git a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
index b3144e1..f1c5ed3 100644
--- a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
+++ b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
@@ -42,8 +42,9 @@
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
}
@@ -81,9 +82,10 @@
@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().executeAdbCommand("unroot");
