summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs
diff options
context:
space:
mode:
authorVinit Deshapnde <vinitd@google.com>2013-10-02 12:29:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 12:29:26 -0700
commitadcf86961356157089daa4dc13c865258d1eea49 (patch)
tree6a572c21652d664bc65a5fe564bd1f14cd9d0342 /packages/VpnDialogs
parent7f0e8be082590dadb8606f71f4b9b28b88851360 (diff)
parentb1992b55e967329f3bc9a63229615130761df701 (diff)
downloadframeworks_base-adcf86961356157089daa4dc13c865258d1eea49.zip
frameworks_base-adcf86961356157089daa4dc13c865258d1eea49.tar.gz
frameworks_base-adcf86961356157089daa4dc13c865258d1eea49.tar.bz2
am b1992b55: am e42325c7: Merge "Fix incorrect VPN time" into klp-dev
* commit 'b1992b55e967329f3bc9a63229615130761df701': Fix incorrect VPN time
Diffstat (limited to 'packages/VpnDialogs')
-rw-r--r--packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java2
1 files changed, 1 insertions, 1 deletions
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 @@ 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));