Change workflow so update() is not called when the device changes orientation.
BUG: 24508289 Change-Id: I7929aac953741a19f5bc4ffbbb9929a9a2f6104e
This commit is contained in:
@@ -117,11 +117,17 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
|
||||
|
||||
private Preference mExplore;
|
||||
|
||||
private boolean mDetached;
|
||||
|
||||
private boolean isVolumeValid() {
|
||||
return (mVolume != null) && (mVolume.getType() == VolumeInfo.TYPE_PRIVATE)
|
||||
&& mVolume.isMountedReadable();
|
||||
}
|
||||
|
||||
public PrivateVolumeSettings() {
|
||||
setRetainInstance(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getMetricsCategory() {
|
||||
return MetricsLogger.DEVICEINFO_STORAGE;
|
||||
@@ -158,10 +164,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
|
||||
|
||||
mExplore = buildAction(R.string.storage_menu_explore);
|
||||
|
||||
mDetached = false;
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
}
|
||||
|
||||
public void update() {
|
||||
private void update() {
|
||||
if (!isVolumeValid()) {
|
||||
getActivity().finish();
|
||||
return;
|
||||
@@ -304,8 +312,11 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
|
||||
}
|
||||
|
||||
mStorageManager.registerListener(mStorageListener);
|
||||
|
||||
if (!mDetached) {
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
@@ -313,12 +324,19 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
|
||||
mStorageManager.unregisterListener(mStorageListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
mDetached = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
if (mMeasure != null) {
|
||||
mMeasure.onDestroy();
|
||||
}
|
||||
mDetached = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user