diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-03 18:22:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-03 18:22:29 -0800 |
| commit | e5f823ccf1cce4cab5699f1a07c1ee2290a69169 (patch) | |
| tree | 4e4d38fda8ec4422e04ba07bfc65773c6261cc11 | |
| parent | 07ca17040a201ac821ea70dbe4dd6e86607786b5 (diff) | |
| parent | 5a2c6fbf847af971457f014ce7073812c9dd31e7 (diff) | |
| download | frameworks_base-e5f823ccf1cce4cab5699f1a07c1ee2290a69169.zip frameworks_base-e5f823ccf1cce4cab5699f1a07c1ee2290a69169.tar.gz frameworks_base-e5f823ccf1cce4cab5699f1a07c1ee2290a69169.tar.bz2 | |
am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1
* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
NPE in in AppGlobals#getIntCoreSetting
| -rw-r--r-- | core/java/android/app/AppGlobals.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ public class AppGlobals { * @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; + } } } |