Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e42325c7: Merge "Fix incorrect VPN time" into klp-dev

Browse Source 
* commit 'e42325c765fb4ec3a03d9de7eeaa0ed435a9f7b6':
  Fix incorrect VPN time
This commit is contained in:
Vinit Deshapnde
2013-10-02 12:26:30 -07:00
committed by Android Git Automerger
parent c114e19c10 e42325c765
commit b1992b55e9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
View File

@@ -147,7 +147,7 @@ public class ManageDialog extends AlertActivity implements
mHandler.removeMessages(0); mHandler.removeMessages(0);
if (!isFinishing()) { if (!isFinishing()) {
if (mConfig.startTime != 0) { if (mConfig.startTime != -1) {
long seconds = (SystemClock.elapsedRealtime() - mConfig.startTime) / 1000; long seconds = (SystemClock.elapsedRealtime() - mConfig.startTime) / 1000;
mDuration.setText(String.format("%02d:%02d:%02d", mDuration.setText(String.format("%02d:%02d:%02d",
seconds / 3600, seconds / 60 % 60, seconds % 60)); seconds / 3600, seconds / 60 % 60, seconds % 60));

3
services/java/com/android/server/connectivity/Vpn.java
View File

@@ -1096,6 +1096,9 @@ public class Vpn extends BaseNetworkStateTracker {
// Here is the last step and it must be done synchronously. // Here is the last step and it must be done synchronously.
synchronized (Vpn.this) { synchronized (Vpn.this) {
// Set the start time
mConfig.startTime = SystemClock.elapsedRealtime();
// Check if the thread is interrupted while we are waiting. // Check if the thread is interrupted while we are waiting.
checkpoint(false); checkpoint(false);