From 006295e78d1f19ac3f4fc90eba870f06dbc98212 Mon Sep 17 00:00:00 2001
From: Tim Baverstock <tim.baverstock@shazamteam.com>
Date: Thu, 14 Nov 2013 12:13:39 +0000
Subject: [PATCH] Probably fix intermittent irreproducible NPE

---
 .../com/actionbarsherlock/internal/view/menu/MenuBuilder.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
index 179b8f037..23d7e60e3 100644
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
+++ b/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
@@ -353,6 +353,10 @@ public void restoreActionViewStates(Bundle states) {
         SparseArray<Parcelable> viewStates = states.getSparseParcelableArray(
                 getActionViewStatesKey());
 
+        if (viewStates == null) {
+            return; // NPE from View.restoreHierarchyState, dispatchRestoreInstanceState:6473.
+        }
+
         final int itemCount = size();
         for (int i = 0; i < itemCount; i++) {
             final MenuItem item = getItem(i);