Merge "Add message about disk encryption for BYOD provisioning test." into lmp-sprout-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/projection/offscreen/ProjectionOffscreenActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/projection/offscreen/ProjectionOffscreenActivity.java
index c202bb1..cfa097b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/projection/offscreen/ProjectionOffscreenActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/projection/offscreen/ProjectionOffscreenActivity.java
@@ -76,7 +76,7 @@
public void run() {
try {
mService.onKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN));
- mTimeKeyEventSent = SystemClock.uptimeMillis();
+ mTimeKeyEventSent = SystemClock.elapsedRealtime();
} catch (RemoteException e) {
Log.e(TAG, "Error running onKeyEvent", e);
}
@@ -103,11 +103,11 @@
handler.postDelayed(
sendKeyEventRunnable, DELAYED_RUNNABLE_TIME);
mStatusView.setText("Running test...");
- mTimeScreenTurnedOff = SystemClock.uptimeMillis();
+ mTimeScreenTurnedOff = SystemClock.elapsedRealtime();
// Notify user its safe to turn screen back on after 5s + fudge factor
handler.postDelayed(playNotificationRunnable, TIME_SCREEN_OFF + 500);
} else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) {
- if (SystemClock.uptimeMillis() - mTimeScreenTurnedOff < TIME_SCREEN_OFF) {
+ if (SystemClock.elapsedRealtime() - mTimeScreenTurnedOff < TIME_SCREEN_OFF) {
mStatusView.setText("ERROR: Turned on screen too early");
getPassButton().setEnabled(false);
mTestStatus = TestStatus.FAILED;
@@ -198,7 +198,7 @@
if (mTimeKeyEventSent != 0
&& mTestStatus == TestStatus.RUNNING
- && mTimeKeyEventSent + RENDERER_DELAY_THRESHOLD < SystemClock.uptimeMillis()) {
+ && mTimeKeyEventSent + RENDERER_DELAY_THRESHOLD < SystemClock.elapsedRealtime()) {
mTestStatus = TestStatus.FAILED;
mStatusView.setText("Failed: took too long to render");
}