diff options
| author | San Mehat <san@google.com> | 2010-02-19 09:57:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-19 09:57:29 -0800 |
| commit | 884ed0190c46faf3fc0e156a80a7bdb133712ed1 (patch) | |
| tree | d4b1e47a6cbcb24f8f278d93c69041d3bcf1d38b | |
| parent | eac461cf7c246df737d2b0e7bd30be176a34c36e (diff) | |
| parent | fafb041b47c1c5f6a4c253768295ed3aeb7ad412 (diff) | |
| download | frameworks_base-884ed0190c46faf3fc0e156a80a7bdb133712ed1.zip frameworks_base-884ed0190c46faf3fc0e156a80a7bdb133712ed1.tar.gz frameworks_base-884ed0190c46faf3fc0e156a80a7bdb133712ed1.tar.bz2 | |
Merge "MountService: Move boot-time mount to a thread - avoids ANR at boot"
| -rw-r--r-- | services/java/com/android/server/MountService.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index d6e23fb..2a78806 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -150,13 +150,23 @@ class MountService extends IMountService.Stub notifyVolumeStateChange(null, "/sdcard", VolumeState.NoMedia, VolumeState.Mounted); return; } - String path = Environment.getExternalStorageDirectory().getPath(); - if (getVolumeState(path).equals(Environment.MEDIA_UNMOUNTED)) { - int rc = doMountVolume(path); - if (rc != StorageResultCode.OperationSucceeded) { - Log.e(TAG, String.format("Boot-time mount failed (%d)", rc)); + new Thread() { + public void run() { + try { + String path = Environment.getExternalStorageDirectory().getPath(); + if (getVolumeState( + Environment.getExternalStorageDirectory().getPath()).equals( + Environment.MEDIA_UNMOUNTED)) { + int rc = doMountVolume(path); + if (rc != StorageResultCode.OperationSucceeded) { + Log.e(TAG, String.format("Boot-time mount failed (%d)", rc)); + } + } + } catch (Exception ex) { + Log.e(TAG, "Boot-time mount exception", ex); + } } - } + }.start(); } } }; |