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

Commit afab9a4c 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 

am: 5bdf449a

Change-Id: I47c84d329a6398a66e78d8a27f7b43471b9ef9e5
parents d1640f03 5bdf449a

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

+3 −2
Original line number Diff line number Diff line
@@ -16353,8 +16353,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) {