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

am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo

Browse Source 
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp

* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
  Forcibly unmount the sdcard after N retries.
This commit is contained in:
Suchi Amalapurapu
2010-04-06 10:55:43 -07:00
committed by Android Git Automerger
parent 7eeb44f205 fede9aed2b
commit e6fdab7f00
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,15 +213,14 @@ class MountService extends IMountService.Stub
} }
case H_UNMOUNT_PM_DONE: { case H_UNMOUNT_PM_DONE: {
if (DEBUG_UNMOUNT) Slog.i(TAG, "H_UNMOUNT_PM_DONE"); if (DEBUG_UNMOUNT) Slog.i(TAG, "H_UNMOUNT_PM_DONE");
if (!mUpdatingStatus) {
// Does not correspond to unmount's status update.
return;
}
if (DEBUG_UNMOUNT) Slog.i(TAG, "Updated status. Processing requests"); if (DEBUG_UNMOUNT) Slog.i(TAG, "Updated status. Processing requests");
mUpdatingStatus = false; mUpdatingStatus = false;
int size = mForceUnmounts.size(); int size = mForceUnmounts.size();
int sizeArr[] = new int[size]; int sizeArr[] = new int[size];
int sizeArrN = 0; int sizeArrN = 0;
// Kill processes holding references first
ActivityManagerService ams = (ActivityManagerService)
ServiceManager.getService("activity");
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
UnmountCallBack ucb = mForceUnmounts.get(i); UnmountCallBack ucb = mForceUnmounts.get(i);
String path = ucb.path; String path = ucb.path;
@@ -233,12 +232,8 @@ class MountService extends IMountService.Stub
if (pids == null || pids.length == 0) { if (pids == null || pids.length == 0) {
done = true; done = true;
} else { } else {
// Kill processes holding references first
ActivityManagerService ams = (ActivityManagerService)
ServiceManager.getService("activity");
// Eliminate system process here? // Eliminate system process here?
boolean ret = ams.killPids(pids, "Unmount media"); ams.killPids(pids, "unmount media");
if (ret) {
// Confirm if file references have been freed. // Confirm if file references have been freed.
pids = getStorageUsers(path); pids = getStorageUsers(path);
if (pids == null || pids.length == 0) { if (pids == null || pids.length == 0) {
@@ -246,22 +241,21 @@ class MountService extends IMountService.Stub
} }
} }
} }
} if (!done && (ucb.retries < MAX_UNMOUNT_RETRIES)) {
if (done) { // Retry again
sizeArr[sizeArrN++] = i; Slog.i(TAG, "Retrying to kill storage users again");
mHandler.sendMessage(mHandler.obtainMessage(H_UNMOUNT_MS,
ucb));
} else {
if (ucb.retries >= MAX_UNMOUNT_RETRIES) {
Slog.i(TAG, "Cannot unmount media inspite of " +
MAX_UNMOUNT_RETRIES + " retries");
// Send final broadcast indicating failure to unmount.
} else {
mHandler.sendMessageDelayed( mHandler.sendMessageDelayed(
mHandler.obtainMessage(H_UNMOUNT_PM_DONE, mHandler.obtainMessage(H_UNMOUNT_PM_DONE,
ucb.retries++), ucb.retries++),
RETRY_UNMOUNT_DELAY); RETRY_UNMOUNT_DELAY);
} else {
if (ucb.retries >= MAX_UNMOUNT_RETRIES) {
Slog.i(TAG, "Failed to unmount media inspite of " +
MAX_UNMOUNT_RETRIES + " retries. Forcibly killing processes now");
} }
sizeArr[sizeArrN++] = i;
mHandler.sendMessage(mHandler.obtainMessage(H_UNMOUNT_MS,
ucb));
} }
} }
// Remove already processed elements from list. // Remove already processed elements from list.