From b434182db3d1723beb507e8cc4dde13990cf26ea Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Sat, 11 Feb 2012 14:12:56 -0500 Subject: [PATCH] Added a null in Settings added a null check for actionBar in onCreate() as it is null on my tablet (3.1) Change-Id: I13cac0a7b4c4dc076cc0400c73a4f07fd25fb8f5 Signed-off-by: Ricky Barrette --- .../src/com/TwentyCode/android/ExaltedDice/Settings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java index 1b8eeea..77313de 100644 --- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java +++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java @@ -84,7 +84,8 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis */ if(Integer.valueOf(android.os.Build.VERSION.SDK) > 11){ ActionBar actionBar = getActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); + if(actionBar != null) + actionBar.setDisplayHomeAsUpEnabled(true); } super.onCreate(savedInstanceState);