From 5872f58c8fa229ef3fe552d613d0482558ebe1e7 Mon Sep 17 00:00:00 2001
From: Yuichi Araki <yaraki@google.com>
Date: Wed, 30 Nov 2016 01:20:23 +0000
Subject: [PATCH] am 2d0bc6c8: am 86745db1: am ee460c94: am 024b3639: Fix NPE
 on orientation change

* commit '2d0bc6c8d611f00570b4794168ba235568171df2':
  Fix NPE on orientation change

GitOrigin-RevId=2c07630da76833f8b62b8a4307b60004349845a1

PiperOrigin-RevId: 140548884
---
 .../support/design/internal/NavigationMenuPresenter.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/android/support/design/internal/NavigationMenuPresenter.java b/src/android/support/design/internal/NavigationMenuPresenter.java
index f19b78afe..6f374d3fa 100644
--- a/src/android/support/design/internal/NavigationMenuPresenter.java
+++ b/src/android/support/design/internal/NavigationMenuPresenter.java
@@ -463,7 +463,9 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
 
         public Bundle createInstanceState() {
             Bundle state = new Bundle();
-            state.putInt(STATE_CHECKED_ITEM, mCheckedItem.getItemId());
+            if (mCheckedItem != null) {
+                state.putInt(STATE_CHECKED_ITEM, mCheckedItem.getItemId());
+            }
             return state;
         }