Fix NPE in ManageApps when switching orientation.

Bug: 6394351
Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c
This commit is contained in:
Amith Yamasani
2012-05-01 14:28:22 -07:00
parent e42b999e16
commit 3b7dbcecf7

View File

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