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

Merge "Adding null check on VolumeInfo" into nyc-dev

Browse Source 
am: f8ab95d13a

* commit 'f8ab95d13aa175631c8f38ced8e9c606b02b6be5':
  Adding null check on VolumeInfo

Change-Id: I4bd2260f8b1c080faa8bd8c20073945f7a7b2fd3
This commit is contained in:
Suprabh Shukla
2016-04-29 20:15:14 +00:00
committed by android-build-merger
parent 5d76be778b f8ab95d13a
commit f43e0dce48
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}