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

Commit c0846fb8 authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Do not wait with zero timeout 

Object.wait() waits forever if zero timeout is passed.
This CL adds a check to avoid that.

Bug: 239503715
Flag: EXEMPT bugfix
Test: None
Change-Id: Ie11240b26f9984755659ea65f1f270a1762ec433
parent e0a66e5b

services/core/java/com/android/server/am/ContentProviderHelper.java

+3 −1
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ public class ContentProviderHelper { 
                    if (conn != null) {

                        conn.waiting = true;

                    }

                    if (wait > 0) {

                        cpr.wait(wait);

                    }

                    if (cpr.provider == null) {

                        timedOut = true;

                        break;