diff options
| author | Christopher Tate <ctate@android.com> | 2014-01-23 00:05:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-23 00:05:29 +0000 |
| commit | 85642f8b23e3dad256e41d1b7c600cabbc31397b (patch) | |
| tree | 5988fb6e313a79ea32e9ad164ac8be4164fecd4b /services/core/java | |
| parent | a0914864f419acb40029a86ef3083231e7976077 (diff) | |
| parent | 222496f82fb78473a876da5dc395714b0fa5b99c (diff) | |
| download | frameworks_base-85642f8b23e3dad256e41d1b7c600cabbc31397b.zip frameworks_base-85642f8b23e3dad256e41d1b7c600cabbc31397b.tar.gz frameworks_base-85642f8b23e3dad256e41d1b7c600cabbc31397b.tar.bz2 | |
am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"
* commit '222496f82fb78473a876da5dc395714b0fa5b99c':
Only send storage intents after boot complete
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/MountService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 0d535cc..816ae69 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -877,7 +877,7 @@ class MountService extends IMountService.Stub /* Send the media unmounted event first */ if (DEBUG_EVENTS) Slog.i(TAG, "Sending unmounted event first"); updatePublicVolumeState(volume, Environment.MEDIA_UNMOUNTED); - sendStorageIntent(Environment.MEDIA_UNMOUNTED, volume, UserHandle.ALL); + sendStorageIntent(Intent.ACTION_MEDIA_UNMOUNTED, volume, UserHandle.ALL); if (DEBUG_EVENTS) Slog.i(TAG, "Sending media removed"); updatePublicVolumeState(volume, Environment.MEDIA_REMOVED); @@ -1164,6 +1164,7 @@ class MountService extends IMountService.Stub private void sendStorageIntent(String action, StorageVolume volume, UserHandle user) { final Intent intent = new Intent(action, Uri.parse("file://" + volume.getPath())); intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, volume); + intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); Slog.d(TAG, "sendStorageIntent " + intent + " to " + user); mContext.sendBroadcastAsUser(intent, user); } |