diff options
author | Brad Fitzpatrick <bradfitz@android.com> | 2010-11-10 11:07:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 11:07:18 -0800 |
commit | bf44ebae04f837596b9942ccb15d3d47bad4acec (patch) | |
tree | 84980959c1312d1bfcdbcfa5153f9983e294e9b9 /services | |
parent | 12a22635ebfcdf9f5dff7081740da680c9b689ae (diff) | |
parent | 9de93424cc05446e3a216f406c55a3937c028416 (diff) | |
download | frameworks_base-bf44ebae04f837596b9942ccb15d3d47bad4acec.zip frameworks_base-bf44ebae04f837596b9942ccb15d3d47bad4acec.tar.gz frameworks_base-bf44ebae04f837596b9942ccb15d3d47bad4acec.tar.bz2 |
am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
* commit '9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/MountService.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 85bb3aa..297cbbb 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1144,6 +1144,17 @@ class MountService extends IMountService.Stub // Post a unmount message. ShutdownCallBack ucb = new ShutdownCallBack(path, observer); mHandler.sendMessage(mHandler.obtainMessage(H_UNMOUNT_PM_UPDATE, ucb)); + } else if (observer != null) { + /* + * Observer is waiting for onShutDownComplete when we are done. + * Since nothing will be done send notification directly so shutdown + * sequence can continue. + */ + try { + observer.onShutDownComplete(StorageResultCode.OperationSucceeded); + } catch (RemoteException e) { + Slog.w(TAG, "RemoteException when shutting down"); + } } } |