Merge "Free AssetManager weak refs before unmounting" into gingerbread (cee0b97e) · Commits · e / os / android_frameworks_base

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

+25 −0

Original line number	Diff line number	Diff line
		@@ -826,6 +826,15 @@ class MountService extends IMountService.Stub
		if (!getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
		return VoldResponseCode.OpFailedVolNotMounted;
		}

		/*
		* Force a GC to make sure AssetManagers in other threads of the
		* system_server are cleaned up. We have to do this since AssetManager
		* instances are kept as a WeakReference and it's possible we have files
		* open on the external storage.
		*/
		Runtime.getRuntime().gc();

		// Redundant probably. But no harm in updating state again.
		mPms.updateExternalMediaStatus(false, false);
		try {
		@@ -1277,6 +1286,14 @@ class MountService extends IMountService.Stub
		waitForReady();
		warnOnNotMounted();

		/*
		* Force a GC to make sure AssetManagers in other threads of the
		* system_server are cleaned up. We have to do this since AssetManager
		* instances are kept as a WeakReference and it's possible we have files
		* open on the external storage.
		*/
		Runtime.getRuntime().gc();

		int rc = StorageResultCode.OperationSucceeded;
		try {
		mConnector.doCommand(String.format("asec destroy %s%s", id, (force ? " force" : "")));
		@@ -1341,6 +1358,14 @@ class MountService extends IMountService.Stub
		}
		}

		/*
		* Force a GC to make sure AssetManagers in other threads of the
		* system_server are cleaned up. We have to do this since AssetManager
		* instances are kept as a WeakReference and it's possible we have files
		* open on the external storage.
		*/
		Runtime.getRuntime().gc();

		int rc = StorageResultCode.OperationSucceeded;
		String cmd = String.format("asec unmount %s%s", id, (force ? " force" : ""));
		try {