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

Avoid a few crashes around unmounting.

Browse Source 
Also refresh UI when metadata changes.

Bug: 19993667
Change-Id: Ib0ea9be68a3db5c71d15fae6809f31df43fd9af0
This commit is contained in:
Jeff Sharkey
2015-04-14 23:16:59 -07:00
parent 4366b565e1
commit 7bc9235aaa
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,14 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
refresh(); refresh();
} }
} }
@Override
public void onVolumeMetadataChanged(VolumeInfo vol) {
if (Objects.equals(mVolume.getId(), vol.getId())) {
mVolume = vol;
refresh();
}
}
}; };
/** /**

2
src/com/android/settings/deviceinfo/PrivateVolumeUnmountConfirm.java
View File

@@ -48,7 +48,7 @@ public class PrivateVolumeUnmountConfirm extends InstrumentedFragment {
final StorageManager storage = getActivity().getSystemService(StorageManager.class); final StorageManager storage = getActivity().getSystemService(StorageManager.class);
final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID); final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
mVolume = storage.findVolumeById(volumeId); mVolume = storage.findVolumeById(volumeId);
mDisk = storage.findDiskById(mVolume.getId()); mDisk = storage.findDiskById(mVolume.getDiskId());
final View view = inflater.inflate(R.layout.storage_internal_unmount, container, false); final View view = inflater.inflate(R.layout.storage_internal_unmount, container, false);
final TextView body = (TextView) view.findViewById(R.id.body); final TextView body = (TextView) view.findViewById(R.id.body);

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

@@ -122,18 +122,6 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
screen.addPreference(mGraph); screen.addPreference(mGraph);
screen.addPreference(mTotal); screen.addPreference(mTotal);
screen.addPreference(mAvailable); screen.addPreference(mAvailable);
}
if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) {
screen.addPreference(mMount);
}
if (mVolume.getState() == VolumeInfo.STATE_MOUNTED) {
screen.addPreference(mUnmount);
}
screen.addPreference(mFormat);
if (mDisk.isAdoptable()) {
screen.addPreference(mFormatInternal);
}
final File file = mVolume.getPath(); final File file = mVolume.getPath();
mTotalSize = file.getTotalSpace(); mTotalSize = file.getTotalSpace();
@@ -148,6 +136,18 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
mGraph.commit(); mGraph.commit();
} }
if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) {
screen.addPreference(mMount);
}
if (mVolume.getState() == VolumeInfo.STATE_MOUNTED) {
screen.addPreference(mUnmount);
}
screen.addPreference(mFormat);
if (mDisk.isAdoptable()) {
screen.addPreference(mFormatInternal);
}
}
private UsageBarPreference buildGraph() { private UsageBarPreference buildGraph() {
final UsageBarPreference pref = new UsageBarPreference(getActivity()); final UsageBarPreference pref = new UsageBarPreference(getActivity());
pref.setOrder(mNextOrder++); pref.setOrder(mNextOrder++);
@@ -215,5 +215,13 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
refresh(); refresh();
} }
} }
@Override
public void onVolumeMetadataChanged(VolumeInfo vol) {
if (Objects.equals(mVolume.getId(), vol.getId())) {
mVolume = vol;
refresh();
}
}
}; };
} }