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

Commit 5bdf449a authored by Tetsutoki Shiozawa's avatar Tetsutoki Shiozawa Committed by android-build-merger
Browse files

Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev 

am: d25c718a

Change-Id: Ib7f8efc9d74143cedd7ad06aaec7693ca01ae2e7
parents 643fc834 d25c718a

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -16347,8 +16347,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                for (int curUser : users) {

                    long timeout = SystemClock.uptimeMillis() + 5000;

                    synchronized (conn) {

                        long now = SystemClock.uptimeMillis();

                        while (conn.mContainerService == null && now < timeout) {

                        long now;

                        while (conn.mContainerService == null &&

                                (now = SystemClock.uptimeMillis()) < timeout) {

                            try {

                                conn.wait(timeout - now);

                            } catch (InterruptedException e) {