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

Merge "Fix NPE at Storage Settings configuration change" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-28 02:01:54 +00:00
committed by Android (Google) Code Review
parent 90c29cf014 07f2086ecd
commit aab74b24c0
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/deviceinfo/StorageCategoryFragment.java
View File

@@ -73,6 +73,7 @@ public class StorageCategoryFragment extends DashboardFragment
LoaderManager.LoaderCallbacks<SparseArray<StorageAsyncLoader.StorageResult>>, LoaderManager.LoaderCallbacks<SparseArray<StorageAsyncLoader.StorageResult>>,
Preference.OnPreferenceClickListener { Preference.OnPreferenceClickListener {
private static final String TAG = "StorageCategoryFrag"; private static final String TAG = "StorageCategoryFrag";
private static final String SELECTED_STORAGE_ENTRY_KEY = "selected_storage_entry_key";
private static final String SUMMARY_PREF_KEY = "storage_summary"; private static final String SUMMARY_PREF_KEY = "storage_summary";
private static final String FREE_UP_SPACE_PREF_KEY = "free_up_space"; private static final String FREE_UP_SPACE_PREF_KEY = "free_up_space";
private static final int STORAGE_JOB_ID = 0; private static final int STORAGE_JOB_ID = 0;
@@ -127,6 +128,10 @@ public class StorageCategoryFragment extends DashboardFragment
mStorageManager = getActivity().getSystemService(StorageManager.class); mStorageManager = getActivity().getSystemService(StorageManager.class);
if (icicle != null) {
mSelectedStorageEntry = icicle.getParcelable(SELECTED_STORAGE_ENTRY_KEY);
}
initializePreference(); initializePreference();
} }
@@ -167,6 +172,12 @@ public class StorageCategoryFragment extends DashboardFragment
} }
} }
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putParcelable(SELECTED_STORAGE_ENTRY_KEY, mSelectedStorageEntry);
super.onSaveInstanceState(outState);
}
private void onReceivedSizes() { private void onReceivedSizes() {
boolean stopLoading = false; boolean stopLoading = false;
if (mStorageInfo != null) { if (mStorageInfo != null) {