From af6c41957462a1ef7c59bd77f4a771f097421227 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 27 Apr 2016 14:05:54 -0700 Subject: [PATCH] Adding null check on VolumeInfo Storage manager returns null volumeInfo for a volume that is ejected. Adding a null check to prevent crashing system ui. Bug: b/28211502 Change-Id: Icd18dda8cad4e6020df3e4c5b3be6daaa3b22fbe --- .../src/com/android/systemui/usb/StorageNotification.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index 2c53e29620494..36dd727934289 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -654,8 +654,9 @@ public class StorageNotification extends SystemUI { intent.putExtra(PackageManager.EXTRA_MOVE_ID, move.moveId); final VolumeInfo vol = mStorageManager.findVolumeByQualifiedUuid(move.volumeUuid); - intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, vol.getId()); - + if (vol != null) { + intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, vol.getId()); + } return PendingIntent.getActivityAsUser(mContext, move.moveId, intent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT); }