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

Merge "Gracefully finish when missing volume." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-06-16 23:48:06 +00:00
committed by Android (Google) Code Review
parent 94f4cb4e46 e79ff145f3
commit 4e42cbdba3
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -127,7 +127,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID); mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
mVolume = mStorageManager.findVolumeById(mVolumeId); mVolume = mStorageManager.findVolumeById(mVolumeId);
Preconditions.checkNotNull(mVolume); if (mVolume == null) {
Log.d(TAG, "Leaving details fragment due to missing volume");
finish();
return;
}
Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE); Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
addPreferencesFromResource(R.xml.device_info_storage_volume); addPreferencesFromResource(R.xml.device_info_storage_volume);

7
src/com/android/settings/deviceinfo/PublicVolumeSettings.java
View File

@@ -90,7 +90,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
mVolume = mStorageManager.findVolumeById(volId); mVolume = mStorageManager.findVolumeById(volId);
} }
Preconditions.checkNotNull(mVolume); if (mVolume == null) {
Log.d(TAG, "Leaving details fragment due to missing volume");
finish();
return;
}
Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC); Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);
mDisk = mStorageManager.findDiskById(mVolume.getDiskId()); mDisk = mStorageManager.findDiskById(mVolume.getDiskId());