Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0464c07a authored by Johan Redestig's avatar Johan Redestig
Browse files

Only send storage intents after boot complete 

It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.

If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.

Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.

Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0
parent c9a60b0f

services/java/com/android/server/MountService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -877,7 +877,7 @@ class MountService extends IMountService.Stub 
                /* Send the media unmounted event first */

                /* Send the media unmounted event first */

                if (DEBUG_EVENTS) Slog.i(TAG, "Sending unmounted event first");

                if (DEBUG_EVENTS) Slog.i(TAG, "Sending unmounted event first");

                updatePublicVolumeState(volume, Environment.MEDIA_UNMOUNTED);

                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");

                if (DEBUG_EVENTS) Slog.i(TAG, "Sending media removed");

                updatePublicVolumeState(volume, Environment.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) {

    private void sendStorageIntent(String action, StorageVolume volume, UserHandle user) {

        final Intent intent = new Intent(action, Uri.parse("file://" + volume.getPath()));

        final Intent intent = new Intent(action, Uri.parse("file://" + volume.getPath()));

        intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, volume);

        intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, volume);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        Slog.d(TAG, "sendStorageIntent " + intent + " to " + user);

        Slog.d(TAG, "sendStorageIntent " + intent + " to " + user);

        mContext.sendBroadcastAsUser(intent, user);

        mContext.sendBroadcastAsUser(intent, user);

    }

    }