From e32e8efcb90c57c44f252f1b5ca32a67fc87789b Mon Sep 17 00:00:00 2001
From: Suchi Amalapurapu <>
Date: Tue, 24 Mar 2009 18:51:34 -0700
Subject: [PATCH] Automated import from //branches/cupcake/...@142033,142033

---
 src/com/android/settings/ManageApplications.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index dbbd249e8f9..1595de14838 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -1459,8 +1459,12 @@ public class ManageApplications extends ListActivity implements
     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