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

Merge "Solve the infinite loop on clearExternalStorageDataSync"

Browse Source
This commit is contained in:
Todd Kennedy
2016-07-11 14:32:02 +00:00
committed by Gerrit Code Review
parent 18941cb53f b87ce12359
commit 9a3fbe1162
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

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