diff options
| author | San Mehat <san@google.com> | 2010-02-09 08:58:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-09 08:58:23 -0800 |
| commit | c8da710f001f149557121b535da0b71d6da87484 (patch) | |
| tree | 55e7624b55fbaf782fd8afbe1fdd7c41ad5c9318 /core | |
| parent | ace5a3fbfbf1b41905410925f1ea007040a7a675 (diff) | |
| parent | 1bf3f8be7c01aa77afc114e0728cb041e95640b1 (diff) | |
| download | frameworks_base-c8da710f001f149557121b535da0b71d6da87484.zip frameworks_base-c8da710f001f149557121b535da0b71d6da87484.tar.gz frameworks_base-c8da710f001f149557121b535da0b71d6da87484.tar.bz2 | |
Merge changes I1aabef01,I8dbd0f83
* changes:
SystemServer: Move MountService startup before NotificationManagerService
StorageManager: Check for a null MountService
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/storage/StorageManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/storage/StorageManager.java b/core/java/android/storage/StorageManager.java index dd8bd63..924d169 100644 --- a/core/java/android/storage/StorageManager.java +++ b/core/java/android/storage/StorageManager.java @@ -254,6 +254,10 @@ public class StorageManager */ public StorageManager(Looper tgtLooper) throws RemoteException { mMountService = IMountService.Stub.asInterface(ServiceManager.getService("mount")); + if (mMountService == null) { + Log.e(TAG, "Unable to connect to mount service! - is it running yet?"); + return; + } mTgtLooper = tgtLooper; mBinderListener = new MountServiceBinderListener(); mMountService.registerListener(mBinderListener); |