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

Merge "Don't crash on opening ejecting USB." into oc-dev

Browse Source 
am: 32f95292bf

Change-Id: Iaceb5e9ec424cf8dc175ab4d2645c50eacc86408
This commit is contained in:
Daniel Nishi
2017-04-25 22:39:35 +00:00
committed by android-build-merger
parent 999f6a9a29 32f95292bf
commit 3803bb966d
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,9 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
mVolume = mStorageManager.findVolumeByUuid(fsUuid);
} else {
final String volId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
mVolume = mStorageManager.findVolumeById(volId);
if (volId != null) {
mVolume = mStorageManager.findVolumeById(volId);
}
}
if (!isVolumeValid()) {
@@ -129,6 +131,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
// If the volume isn't valid, we are not scaffolded to set up a view.
if (!isVolumeValid()) {
return;
}
final Resources resources = getResources();
final int padding = resources.getDimensionPixelSize(
R.dimen.unmount_button_padding);