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

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

Merge \\\"Solve the infinite loop on clearExternalStorageDataSync\\\" into... 

Merge \\\"Solve the infinite loop on clearExternalStorageDataSync\\\" into nyc-dev am: d25c718a am: 5bdf449a
am: afab9a4c

Change-Id: I5b9746dbbb0e771630c17893f9d292c1493254f6
parents ed829b59 afab9a4c

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

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

                for (int curUser : users) {

                    long timeout = SystemClock.uptimeMillis() + 5000;

                    long timeout = SystemClock.uptimeMillis() + 5000;

                    synchronized (conn) {

                    synchronized (conn) {

                        long now = SystemClock.uptimeMillis();

                        long now;

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

                        while (conn.mContainerService == null &&

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

                            try {

                            try {

                                conn.wait(timeout - now);

                                conn.wait(timeout - now);

                            } catch (InterruptedException e) {

                            } catch (InterruptedException e) {