Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5f823cc authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

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

* commit '5a2c6fbf':
  NPE in in AppGlobals#getIntCoreSetting
parents 07ca1704 5a2c6fbf

core/java/android/app/AppGlobals.java

+6 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }

}