commit 9d61fd41d558d1a7eb70a83ef23f3336fa9fa9eb
author Grigory Novikov <grigory.novikov@gmail.com> Thu May 12 17:10:11 2016 -0700
committer Grigory Novikov <grigory.novikov@gmail.com> Thu May 12 17:49:14 2016 -0700
tree 50d77865108e819b5f464639e8d281d776a06d2b
parent b0348c292881f79d204fcc2d1d1c60ebcd6a1b2b

Fixed NPE for HoneycombDelegate

Issue 209766:   Need to add a null check in setActionBarUpIndicator for
Honeycomb delegate

v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
index c15c531..f10cd18 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
@@ -536,10 +536,13 @@
 
         @Override
         public void setActionBarUpIndicator(Drawable themeImage, int contentDescRes) {
-            mActivity.getActionBar().setDisplayShowHomeEnabled(true);
-            mSetIndicatorInfo = ActionBarDrawerToggleHoneycomb.setActionBarUpIndicator(
-                    mSetIndicatorInfo, mActivity, themeImage, contentDescRes);
-            mActivity.getActionBar().setDisplayShowHomeEnabled(false);
+            final ActionBar actionBar = mActivity.getActionBar();
+            if (actionBar != null) {
+                actionBar.setDisplayShowHomeEnabled(true);
+                mSetIndicatorInfo = ActionBarDrawerToggleHoneycomb.setActionBarUpIndicator(
+                        mSetIndicatorInfo, mActivity, themeImage, contentDescRes);
+                actionBar.setDisplayShowHomeEnabled(false);
+            }
         }
 
         @Override