From 2d9357f6d0b981d6e00b6fb057eec110d49ff944 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 30 Jun 2011 11:06:52 -0700
Subject: [PATCH] Fix a crash on certain devices in Storage settings.

Bug: 4980974
Change-Id: If4b89f9cb1813c30ced6d7093381a01a5aa00346
---
 src/com/android/settings/deviceinfo/Memory.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 236bdee007f..94ad3e66b99 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -109,7 +109,9 @@ public class Memory extends SettingsPreferenceFragment {
         intentFilter.addDataScheme("file");
         getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
 
-        mInternalStorageVolumePreferenceCategory.onResume();
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onResume();
+        }
         for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
             mStorageVolumePreferenceCategories[i].onResume();
         }
@@ -135,7 +137,9 @@ public class Memory extends SettingsPreferenceFragment {
     public void onPause() {
         super.onPause();
         getActivity().unregisterReceiver(mMediaScannerReceiver);
-        mInternalStorageVolumePreferenceCategory.onPause();
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onPause();
+        }
         for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
             mStorageVolumePreferenceCategories[i].onPause();
         }