PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add nullcheck to StorageSettings." into nyc-dev

Browse Source 
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I58982903534d2dce24bd453bc72617a607373684
This commit is contained in:
Daichi Hirono
2016-04-20 00:12:03 +00:00
committed by android-build-merger
parent d2477357e8 0e048a11c7
commit ef5285e3f6
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -248,6 +248,10 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
// Picked a normal volume // Picked a normal volume
final VolumeInfo vol = mStorageManager.findVolumeById(key); final VolumeInfo vol = mStorageManager.findVolumeById(key);
if (vol == null) {
return false;
}
if (vol.getState() == VolumeInfo.STATE_UNMOUNTED) { if (vol.getState() == VolumeInfo.STATE_UNMOUNTED) {
VolumeUnmountedFragment.show(this, vol.getId()); VolumeUnmountedFragment.show(this, vol.getId());
return true; return true;