Merge "Fix init order so we have something to measure." into mnc-dev

This commit is contained in:
Jeff Sharkey
2015-07-06 18:00:32 +00:00
committed by Android (Google) Code Review

View File

@@ -129,6 +129,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
mVolume = mStorageManager.findVolumeById(mVolumeId);
// Find the emulated shared storage layered above this private volume
mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
mMeasure = new StorageMeasurement(context, mVolume, mSharedVolume);
mMeasure.setReceiver(mReceiver);
@@ -140,9 +143,6 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
addPreferencesFromResource(R.xml.device_info_storage_volume);
getPreferenceScreen().setOrderingAsAdded(true);
// Find the emulated shared storage layered above this private volume
mSharedVolume = mStorageManager.findEmulatedForPrivate(mVolume);
mSummary = new StorageSummaryPreference(context);
mApps = buildItem(R.string.storage_detail_apps);