commit 7f33f6e92fa22f47af2f8d61883197013fae4c66
author Jean-Michel Trivi <jmtrivi@google.com> Tue Oct 06 00:20:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 06 00:20:09 2015 +0000
tree 5f4e65597698cb3c9b15cbbdb8c965434906dc0b
parent 456a451668728a18198927fe93f19896929535d3
parent 38b987ab794f7e249a239db26dcf98ca8d2ff72b

am 38b987ab: am 0155856a: Fix AudioService rotation helper thread

* commit '38b987ab794f7e249a239db26dcf98ca8d2ff72b':
  Fix AudioService rotation helper thread

services/core/java/com/android/server/audio/RotationHelper.java

diff --git a/services/core/java/com/android/server/audio/RotationHelper.java b/services/core/java/com/android/server/audio/RotationHelper.java
index f03e6c7..359cc36 100644
--- a/services/core/java/com/android/server/audio/RotationHelper.java
+++ b/services/core/java/com/android/server/audio/RotationHelper.java
@@ -192,16 +192,18 @@
         }
 
         public void run() {
-            int newRotation;
             while (mWaitCounter < WAIT_TIMES_MS.length) {
-                updateOrientation();
                 int waitTimeMs;
                 synchronized(mCounterLock) {
-                    waitTimeMs = WAIT_TIMES_MS[mWaitCounter];
+                    waitTimeMs = mWaitCounter < WAIT_TIMES_MS.length ?
+                            WAIT_TIMES_MS[mWaitCounter] : 0;
                     mWaitCounter++;
                 }
                 try {
-                    sleep(waitTimeMs);
+                    if (waitTimeMs > 0) {
+                        sleep(waitTimeMs);
+                        updateOrientation();
+                    }
                 } catch (InterruptedException e) { }
             }
         }