drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-11-15 11:45:49 -08:00
committed by Android (Google) Code Review
parent 445767c14c 0be607cda1
commit a319d655e3
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/MountService.java
View File

@ -198,8 +198,8 @@ class MountService extends IMountService.Stub
// Used as a lock for methods that register/unregister listeners.
final private ArrayList<MountServiceBinderListener> mListeners =
new ArrayList<MountServiceBinderListener>();
private CountDownLatch mConnectedSignal = new CountDownLatch(1);
private CountDownLatch mAsecsScanned = new CountDownLatch(1);
private final CountDownLatch mConnectedSignal = new CountDownLatch(1);
private final CountDownLatch mAsecsScanned = new CountDownLatch(1);
private boolean mSendUmsConnectedOnBoot = false;
/**
@ -495,10 +495,6 @@ class MountService extends IMountService.Stub
}
private void waitForLatch(CountDownLatch latch) {
if (latch == null) {
return;
}
for (;;) {
try {
if (latch.await(5000, TimeUnit.MILLISECONDS)) {
@ -738,14 +734,12 @@ class MountService extends IMountService.Stub
* the hounds!
*/
mConnectedSignal.countDown();
mConnectedSignal = null;
// Let package manager load internal ASECs.
mPms.scanAvailableAsecs();
// Notify people waiting for ASECs to be scanned that it's done.
mAsecsScanned.countDown();
mAsecsScanned = null;
}
}.start();
}