commit af6c41957462a1ef7c59bd77f4a771f097421227
author Suprabh Shukla <suprabh@google.com> Wed Apr 27 14:05:54 2016 -0700
committer Suprabh Shukla <suprabh@google.com> Thu Apr 28 17:56:37 2016 -0700
tree 053742325e09c3d24e2df41424bbfe9621705b15
parent 8438a7297c16c1ee73f4e67efef18ad9062e15f1

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

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

diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
index 2c53e29..36dd727 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 @@
         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);
     }