commit a199526dcdfcd77257ea28d65bf5a454320d939a
author Shunkai Yao <yaoshunkai@google.com> Tue Sep 05 21:21:31 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 05 21:21:31 2023 +0000
tree 0fce465fcf6c5ecf6103d87472aaa3ea7e37f837
parent cc7212ddf54bc9ec55d1f08db39833a7c3d91078
parent 6b1f22fe9fec9b4ba1ed3badb7de6b6df3872a8e

Merge "Avoid Object.wait(0)" into main

media/java/android/media/AudioManager.java

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 1583a1b..fb712bb 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -4580,7 +4580,9 @@
             synchronized (this) {
                 while (!mQuit) {
                     final long timeToWait = timeOutTime - java.lang.System.currentTimeMillis();
-                    if (timeToWait < 0) { break; }
+                    if (timeToWait <= 0) {
+                        break;
+                    }
                     this.wait(timeToWait);
                 }
             }