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

Fix a crash on certain devices in Storage settings.

Browse Source 
Bug: 4980974
Change-Id: If4b89f9cb1813c30ced6d7093381a01a5aa00346
This commit is contained in:
Amith Yamasani
2011-06-30 11:06:52 -07:00
parent 3fa13775e8
commit 2d9357f6d0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,9 @@ public class Memory extends SettingsPreferenceFragment {
intentFilter.addDataScheme("file"); intentFilter.addDataScheme("file");
getActivity().registerReceiver(mMediaScannerReceiver, intentFilter); getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
mInternalStorageVolumePreferenceCategory.onResume(); if (mInternalStorageVolumePreferenceCategory != null) {
mInternalStorageVolumePreferenceCategory.onResume();
}
for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) { for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
mStorageVolumePreferenceCategories[i].onResume(); mStorageVolumePreferenceCategories[i].onResume();
} }
@@ -135,7 +137,9 @@ public class Memory extends SettingsPreferenceFragment {
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
getActivity().unregisterReceiver(mMediaScannerReceiver); getActivity().unregisterReceiver(mMediaScannerReceiver);
mInternalStorageVolumePreferenceCategory.onPause(); if (mInternalStorageVolumePreferenceCategory != null) {
mInternalStorageVolumePreferenceCategory.onPause();
}
for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) { for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
mStorageVolumePreferenceCategories[i].onPause(); mStorageVolumePreferenceCategories[i].onPause();
} }