Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I030864a50a13a02cc825a11245a4d42e6b12e1c6
This commit is contained in:
Agatha Man
2020-05-29 17:38:53 +00:00
committed by Automerger Merge Worker
parent 5b05c2ff71 2719662512
commit e7f34da614
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
View File

@@ -294,6 +294,16 @@ public class StorageNotification extends SystemUI {
private void onPublicVolumeStateChangedInternal(VolumeInfo vol) { private void onPublicVolumeStateChangedInternal(VolumeInfo vol) {
Log.d(TAG, "Notifying about public volume: " + vol.toString()); 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; final Notification notif;
switch (vol.getState()) { switch (vol.getState()) {
case VolumeInfo.STATE_UNMOUNTED: case VolumeInfo.STATE_UNMOUNTED: