Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-10 23:13:51 +00:00
committed by Android (Google) Code Review
parent e8a442ccd6 99bf020f70
commit d25c718a12
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -16338,8 +16338,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) {