Avoid NPE in ActionBarDrawerToggle when no supportActionBar is set

Bug: 17343548 Change-Id: I2c34cccf3fc49a9e7d1a818f8e37b2938784f240
aosp-mirror · Sep 3, 2014 · ce221d9 · ce221d9
1 parent 6170ff5
commit ce221d9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegate.java
@@ -227,7 +227,7 @@ protected final Context getActionBarThemedContext() {
     private class ActionBarDrawableToggleImpl implements ActionBarDrawerToggle.Delegate {
         @Override
         public Drawable getThemeUpIndicator() {
-            final TypedArray a = mActionBar.getThemedContext()
+            final TypedArray a = getActionBarThemedContext()
                     .obtainStyledAttributes(new int[]{ getHomeAsUpIndicatorAttrId() });
             final Drawable result = a.getDrawable(0);
             a.recycle();