Fixed tryAcquire bug for the serial port lock when updating the statu…

…s at the top of the window (was causing some freezes).
maxieds · Jan 17, 2018 · c0d72ec · c0d72ec
1 parent bc5e012
commit c0d72ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.maxieds.chameleonminilivedebugger"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 21
-        versionName "0.2.5"
+        versionCode 23
+        versionName "0.2.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/maxieds/chameleonminilivedebugger/ChameleonIO.java b/app/src/main/java/com/maxieds/chameleonminilivedebugger/ChameleonIO.java
@@ -41,6 +41,7 @@ public class ChameleonIO {
      * Default timeout to use when communicating with the device.
      */
     public static final int TIMEOUT = 2000;
+    public static final int LOCK_TIMEOUT = 350;
 
     /**
      * Static constants for storing state of the device.
@@ -187,7 +188,10 @@ public void run() {
          */
         private void updateAllStatus() {
             try {
-                LiveLoggerActivity.serialPortLock.tryAcquire(ChameleonIO.TIMEOUT, TimeUnit.MILLISECONDS);
+                if(!LiveLoggerActivity.serialPortLock.tryAcquire(ChameleonIO.LOCK_TIMEOUT, TimeUnit.MILLISECONDS)) {
+                    statsUpdateHandler.postDelayed(statsUpdateRunnable, STATS_UPDATE_INTERVAL / 4);
+                    return;
+                }
             } catch(InterruptedException ie) {
                 return;
             }