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

am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread

Browse Source 
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
This commit is contained in:
Kenny Root
2010-09-14 18:04:53 -07:00
committed by Android Git Automerger
parent d2de99e377 cee0b97eed
commit 79a1ee4249
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,6 +826,15 @@ class MountService extends IMountService.Stub
if (!getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) { if (!getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
return VoldResponseCode.OpFailedVolNotMounted; 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. // Redundant probably. But no harm in updating state again.
mPms.updateExternalMediaStatus(false, false); mPms.updateExternalMediaStatus(false, false);
try { try {
@@ -1277,6 +1286,14 @@ class MountService extends IMountService.Stub
waitForReady(); waitForReady();
warnOnNotMounted(); 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; int rc = StorageResultCode.OperationSucceeded;
try { try {
mConnector.doCommand(String.format("asec destroy %s%s", id, (force ? " force" : ""))); 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; int rc = StorageResultCode.OperationSucceeded;
String cmd = String.format("asec unmount %s%s", id, (force ? " force" : "")); String cmd = String.format("asec unmount %s%s", id, (force ? " force" : ""));
try { try {