diff options
| author | Kenny Root <kroot@google.com> | 2010-10-06 16:59:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-06 16:59:23 -0700 |
| commit | a3ee5c0351e51f7a978ddddc37644f46051ca6ed (patch) | |
| tree | 413b873eca325c1e7bdcb0358863e334d7cc4331 /services | |
| parent | ef083ec008a3ec69180340912e7f0137472c97d9 (diff) | |
| parent | 17eb6fb07cc6965f09c51adc70b3c291f57a784a (diff) | |
| download | frameworks_base-a3ee5c0351e51f7a978ddddc37644f46051ca6ed.zip frameworks_base-a3ee5c0351e51f7a978ddddc37644f46051ca6ed.tar.gz frameworks_base-a3ee5c0351e51f7a978ddddc37644f46051ca6ed.tar.bz2 | |
Merge "Add MountService tests and fix a bug it found" into gingerbread
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/MountService.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 8e5cdc2..df42c5b 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1743,15 +1743,9 @@ class MountService extends IMountService.Stub action.handleError(); return; } - - mActions.add(action); - break; } - // Once we bind to the service, the first - // pending request will be processed. mActions.add(action); - mObbActionHandler.sendEmptyMessage(OBB_MCS_BOUND); break; } case OBB_MCS_BOUND: { @@ -1821,6 +1815,7 @@ class MountService extends IMountService.Stub if (DEBUG_OBB) Slog.i(TAG, "OBB_MCS_GIVE_UP"); mActions.remove(0); + mObbActionHandler.sendEmptyMessage(OBB_MCS_BOUND); break; } } @@ -1879,6 +1874,7 @@ class MountService extends IMountService.Stub if (DEBUG_OBB) Slog.d(TAG, "Error handling OBB action", e); handleError(); + mObbActionHandler.sendEmptyMessage(OBB_MCS_UNBIND); } } |