commit fe0b0178cb2d24b8e6e1477055617bbf86a0808b
author Hung-ying Tyan <tyanh@google.com> Mon Jul 13 17:23:32 2009 +0800
committer Hung-ying Tyan <tyanh@google.com> Mon Jul 13 17:23:32 2009 +0800
tree 0f38d46f6987bac34c74daf5dda42be2f9c85c61
parent 1ddccd07f744344b5248dd5418ee526f26d520dc

Fix VpnSettings.StatusChecker.start()

to avoid multiple threads checking status at the same time.

src/com/android/settings/vpn/AuthenticationActor.java

diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
index 2584fbd..a05cfa7 100644
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ b/src/com/android/settings/vpn/AuthenticationActor.java
@@ -195,8 +195,8 @@
         if (bindService(c)) {
             // wait for a second, let status propagate
             wait(c, ONE_SECOND);
+            mContext.unbindService(c);
         }
-        mContext.unbindService(c);
     }
 
     private boolean bindService(ServiceConnection c) {

src/com/android/settings/vpn/VpnSettings.java

diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 08dd8dd..1446164 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -932,7 +932,7 @@
     // managing status check in a background thread
     private class StatusChecker {
         private Set<VpnProfile> mQueue = new HashSet<VpnProfile>();
-        private boolean mPaused;
+        private boolean mPaused = true;
         private ConditionVariable mThreadCv = new ConditionVariable();
 
         void onPause() {
@@ -941,7 +941,6 @@
         }
 
         synchronized void onResume() {
-            mPaused = false;
             start();
         }
 
@@ -961,7 +960,9 @@
             return p;
         }
 
-        private void start() {
+        private synchronized void start() {
+            if (!mPaused) return;
+            mPaused = false;
             mThreadCv.close();
             new Thread(new Runnable() {
                 public void run() {