commit f5f40108adb39a05c5d779a73aa644d4c155116d
author Amith Yamasani <yamasani@google.com> Thu Jun 30 12:09:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 30 12:09:34 2011 -0700
tree 69585c4260bef8a00c7f6557a5e51b2adc4f87cb
parent 2d9357f6d0b981d6e00b6fb057eec110d49ff944
parent 68511d0902cb51663c9579a8f1c7eee219084ac4

Merge "Re-enable hardware acceleration. Driver bug seems fixed."

src/com/android/settings/deviceinfo/Memory.java

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 236bdee..94ad3e6 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -109,7 +109,9 @@
         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 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();
         }