commit e42325c765fb4ec3a03d9de7eeaa0ed435a9f7b6
author Vinit Deshapnde <vinitd@google.com> Wed Oct 02 19:23:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 02 19:23:23 2013 +0000
tree bdd0a573cbe531d210a24426922b603ab77b3e02
parent 228a7d2a157c4e6ceee5fdea389f207bbf4990ba
parent 2b862e5e75ad419f17a4cea185b9349e0da70e7b

Merge "Fix incorrect VPN time" into klp-dev

packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java

diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
index 42b8cce..3d5654a 100644
--- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
+++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
@@ -147,7 +147,7 @@
         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));

services/java/com/android/server/connectivity/Vpn.java

diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index 8cc5b4f..45797b2 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -1096,6 +1096,9 @@
 
                 // 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);