commit 3b7dbcecf70788df4950340cbf750dbe524dca96
author Amith Yamasani <yamasani@google.com> Tue May 01 14:28:22 2012 -0700
committer Amith Yamasani <yamasani@google.com> Tue May 01 14:56:13 2012 -0700
tree 46f31ffc60ab1d308421498abdc73da96e5f09b0
parent e42b999e164c6995358271f2128ed296871fb4a1

Fix NPE in ManageApps when switching orientation.

Bug: 6394351
Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c

src/com/android/settings/applications/ManageApplications.java

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index fbaabf4..8a64968 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -539,7 +539,7 @@
         }
         
         mDefaultTab = defaultTabTag;
-        
+
         final Intent containerIntent = new Intent().setComponent(
                 StorageMeasurement.DEFAULT_CONTAINER_COMPONENT);
         getActivity().bindService(containerIntent, mContainerConnection, Context.BIND_AUTO_CREATE);
@@ -759,6 +759,9 @@
     static final int VIEW_RUNNING = 2;
 
     void updateStorageUsage() {
+        // Fragment view not yet created?
+        if (mRootView == null) return;
+
         if (mCurView == VIEW_RUNNING) {
             return;
         }
@@ -939,6 +942,8 @@
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
             mContainerService = IMediaContainerService.Stub.asInterface(service);
+            // Make sure this callback didn't come at an inopportune time.
+            if (getActivity() == null) return;
             updateStorageUsage();
         }