diff options
author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-03 12:55:52 -0800 |
---|---|---|
committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-03-03 12:55:59 -0800 |
commit | 11e515cbefb2d0f38e26cb41c8cd3790f881220c (patch) | |
tree | e1a801322aaf34bc9baa3ba1eda726a11775ec5c /core/java/android | |
parent | 6c8d76527c938eb49182a6fd0677ccbc1618e7a8 (diff) | |
download | frameworks_base-11e515cbefb2d0f38e26cb41c8cd3790f881220c.zip frameworks_base-11e515cbefb2d0f38e26cb41c8cd3790f881220c.tar.gz frameworks_base-11e515cbefb2d0f38e26cb41c8cd3790f881220c.tar.bz2 |
NPE in in AppGlobals#getIntCoreSetting
bug:3508658
It ActivityThread#currentActivityThread() is called when
the ActivityThread is not attached it returns null and
AppGlobals#getIntCoreSetting was not checking for that.
Change-Id: I5e00d1947a161ad1e52ecfaa12cbbac3b534a0db
Diffstat (limited to 'core/java/android')
-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; + } } } |