diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-03 14:25:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-03 14:25:13 -0800 |
| commit | e70c6607e0316fe390d52a544f6832c60223881f (patch) | |
| tree | e227633bc4801e2f8e45477057a4f536c6afcffa | |
| parent | 8264781eb070b980664aa3994b162886b4a74678 (diff) | |
| parent | 11e515cbefb2d0f38e26cb41c8cd3790f881220c (diff) | |
| download | frameworks_base-e70c6607e0316fe390d52a544f6832c60223881f.zip frameworks_base-e70c6607e0316fe390d52a544f6832c60223881f.tar.gz frameworks_base-e70c6607e0316fe390d52a544f6832c60223881f.tar.bz2 | |
Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1
| -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; + } } } |