am 91b57293: am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold... (f99ddad6) · Commits · e / os / android_frameworks_base

services/java/com/android/server/MountService.java

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -198,8 +198,8 @@ class MountService extends IMountService.Stub
	// Used as a lock for methods that register/unregister listeners.		// Used as a lock for methods that register/unregister listeners.
	final private ArrayList<MountServiceBinderListener> mListeners =		final private ArrayList<MountServiceBinderListener> mListeners =
	new ArrayList<MountServiceBinderListener>();		new ArrayList<MountServiceBinderListener>();
	private CountDownLatch mConnectedSignal = new CountDownLatch(1);		private final CountDownLatch mConnectedSignal = new CountDownLatch(1);
	private CountDownLatch mAsecsScanned = new CountDownLatch(1);		private final CountDownLatch mAsecsScanned = new CountDownLatch(1);
	private boolean mSendUmsConnectedOnBoot = false;		private boolean mSendUmsConnectedOnBoot = false;

	/**		/**
	@@ -495,10 +495,6 @@ class MountService extends IMountService.Stub
	}		}

	private void waitForLatch(CountDownLatch latch) {		private void waitForLatch(CountDownLatch latch) {
	if (latch == null) {
	return;
	}

	for (;;) {		for (;;) {
	try {		try {
	if (latch.await(5000, TimeUnit.MILLISECONDS)) {		if (latch.await(5000, TimeUnit.MILLISECONDS)) {
	@@ -738,14 +734,12 @@ class MountService extends IMountService.Stub
	* the hounds!		* the hounds!
	*/		*/
	mConnectedSignal.countDown();		mConnectedSignal.countDown();
	mConnectedSignal = null;

	// Let package manager load internal ASECs.		// Let package manager load internal ASECs.
	mPms.scanAvailableAsecs();		mPms.scanAvailableAsecs();

	// Notify people waiting for ASECs to be scanned that it's done.		// Notify people waiting for ASECs to be scanned that it's done.
	mAsecsScanned.countDown();		mAsecsScanned.countDown();
	mAsecsScanned = null;
	}		}
	}.start();		}.start();
	}		}