Automated import from //branches/donutburger/...@142034,142034
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index dbbd249..1595de1 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -1459,8 +1459,12 @@
public void onStop() {
super.onStop();
// Stop the background threads
- mResourceThread.setAbort();
- mSizeComputor.setAbort();
+ if (mResourceThread != null) {
+ mResourceThread.setAbort();
+ }
+ if (mSizeComputor != null) {
+ mSizeComputor.setAbort();
+ }
// clear all messages related to application list
clearMessagesInHandler();
// register receiver here