Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1992b55 authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android Git Automerger
Browse files

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

* commit 'e42325c7':
  Fix incorrect VPN time
parents c114e19c e42325c7

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

+1 −1
Original line number Diff line number Diff line
@@ -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));

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

+3 −0
Original line number Diff line number Diff line
@@ -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);