commit e5f823ccf1cce4cab5699f1a07c1ee2290a69169
author Svetoslav Ganov <svetoslavganov@google.com> Thu Mar 03 18:22:29 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 03 18:22:29 2011 -0800
tree 4e4d38fda8ec4422e04ba07bfc65773c6261cc11
parent 07ca17040a201ac821ea70dbe4dd6e86607786b5
parent 5a2c6fbf847af971457f014ce7073812c9dd31e7

am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1

* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting

core/java/android/app/AppGlobals.java

diff --git a/core/java/android/app/AppGlobals.java b/core/java/android/app/AppGlobals.java
index 55515b8..2b6db8b 100644
--- a/core/java/android/app/AppGlobals.java
+++ b/core/java/android/app/AppGlobals.java
@@ -55,6 +55,11 @@
      * @return The core settings.
      */
     public static int getIntCoreSetting(String key, int defaultValue) {
-        return ActivityThread.currentActivityThread().getIntCoreSetting(key, defaultValue);
+        ActivityThread currentActivityThread = ActivityThread.currentActivityThread();
+        if (currentActivityThread != null) {
+            return currentActivityThread.getIntCoreSetting(key, defaultValue);
+        } else {
+            return defaultValue;
+        }
     }
 }