Merge "Avoid a few crashes around unmounting." (408a027d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,14 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
		refresh();
		}
		}

		@Override
		public void onVolumeMetadataChanged(VolumeInfo vol) {
		if (Objects.equals(mVolume.getId(), vol.getId())) {
		mVolume = vol;
		refresh();
		}
		}
		};

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class PrivateVolumeUnmountConfirm extends InstrumentedFragment {
		final StorageManager storage = getActivity().getSystemService(StorageManager.class);
		final String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
		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 TextView body = (TextView) view.findViewById(R.id.body);

+20 −12

Original line number	Diff line number	Diff line
		@@ -122,18 +122,6 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
		screen.addPreference(mGraph);
		screen.addPreference(mTotal);
		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();
		mTotalSize = file.getTotalSpace();
		@@ -148,6 +136,18 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
		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() {
		final UsageBarPreference pref = new UsageBarPreference(getActivity());
		pref.setOrder(mNextOrder++);
		@@ -215,5 +215,13 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
		refresh();
		}
		}

		@Override
		public void onVolumeMetadataChanged(VolumeInfo vol) {
		if (Objects.equals(mVolume.getId(), vol.getId())) {
		mVolume = vol;
		refresh();
		}
		}
		};
		}