Merge "Appease the monkey gods." into jb-dev

This commit is contained in:
Amith Yamasani
2012-05-08 16:37:31 -07:00
committed by Android (Google) Code Review

View File

@@ -761,6 +761,8 @@ public class ManageApplications extends Fragment implements
void updateStorageUsage() { void updateStorageUsage() {
// Fragment view not yet created? // Fragment view not yet created?
if (mRootView == null) return; if (mRootView == null) return;
// Make sure a callback didn't come at an inopportune time.
if (getActivity() == null) return;
if (mCurView == VIEW_RUNNING) { if (mCurView == VIEW_RUNNING) {
return; return;
@@ -942,8 +944,6 @@ 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();
} }