diff options
| -rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/connectivity/Vpn.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index 42b8cce05d6a..3d5654a56b9e 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -147,7 +147,7 @@ public class ManageDialog extends AlertActivity implements mHandler.removeMessages(0); if (!isFinishing()) { - if (mConfig.startTime != 0) { + if (mConfig.startTime != -1) { long seconds = (SystemClock.elapsedRealtime() - mConfig.startTime) / 1000; mDuration.setText(String.format("%02d:%02d:%02d", seconds / 3600, seconds / 60 % 60, seconds % 60)); diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index 8cc5b4f69cd9..45797b2e4d96 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -1096,6 +1096,9 @@ public class Vpn extends BaseNetworkStateTracker { // Here is the last step and it must be done synchronously. synchronized (Vpn.this) { + // Set the start time + mConfig.startTime = SystemClock.elapsedRealtime(); + // Check if the thread is interrupted while we are waiting. checkpoint(false); |