diff options
| author | Todd Kennedy <toddke@google.com> | 2016-07-11 14:32:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-11 14:32:02 +0000 |
| commit | 9a3fbe116209a6d44a5f9672a3a249cb8932e3d2 (patch) | |
| tree | 112ace698b357534985394398e561c8cb7ef2bee | |
| parent | 18941cb53f6257690ab6966fc22752af6c3780ce (diff) | |
| parent | b87ce123594e95de5596e828dfc84fae359d804e (diff) | |
| download | base-9a3fbe116209a6d44a5f9672a3a249cb8932e3d2.tar.gz | |
Merge "Solve the infinite loop on clearExternalStorageDataSync"
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 7ea9038cc2c5..abc1dc918257 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -13330,8 +13330,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) { |