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

Commit e68f19d7 authored by Agatha Man's avatar Agatha Man Committed by Automerger Merge Worker
Browse files

Merge "Ignore public volume state change event of removed user in Automotive"... 

Merge "Ignore public volume state change event of removed user in Automotive" into rvc-dev am: 27196625 am: 1bc43717

Change-Id: I5f72109bb43ee1b70b91d0f9697a3bc7b008158e
parents 1c0cc3f3 1bc43717

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+10 −0
Original line number Diff line number Diff line
@@ -294,6 +294,16 @@ public class StorageNotification extends SystemUI { 
    private void onPublicVolumeStateChangedInternal(VolumeInfo vol) {

        Log.d(TAG, "Notifying about public volume: " + vol.toString());



        // Volume state change event may come from removed user, in this case, mountedUserId will

        // equals to UserHandle.USER_NULL (-10000) which will do nothing when call cancelAsUser(),

        // but cause crash when call notifyAsUser(). Here we return directly for USER_NULL, and

        // leave all notifications belong to removed user to NotificationManagerService, the latter

        // will remove all notifications of the removed user when handles user stopped broadcast.

        if (isAutomotive() && vol.getMountUserId() == UserHandle.USER_NULL) {

            Log.d(TAG, "Ignore public volume state change event of removed user");

            return;

        }



        final Notification notif;

        switch (vol.getState()) {

            case VolumeInfo.STATE_UNMOUNTED: