commit 6817ed030b32878564f12554e10d71246ee48a8f
author Yuichi Araki <yaraki@google.com> Mon Jun 08 22:10:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 08 22:10:51 2015 +0000
tree 08910a4040f4b6785f9d3524da5e8cbe7b3722dc
parent 6296a7d131a343e2e3697d39ae7ff4fe3ac65cdc
parent 9c1547f89fff53eb2fc20f5726e9cfbf7655fc74

am 9c1547f8: Merge "Fix NPE in NavigationView" into lmp-mr1-ub-dev

* commit '9c1547f89fff53eb2fc20f5726e9cfbf7655fc74':
  Fix NPE in NavigationView

design/src/android/support/design/widget/NavigationView.java

diff --git a/design/src/android/support/design/widget/NavigationView.java b/design/src/android/support/design/widget/NavigationView.java
index e3a626e..11afbc9 100644
--- a/design/src/android/support/design/widget/NavigationView.java
+++ b/design/src/android/support/design/widget/NavigationView.java
@@ -207,10 +207,14 @@
      * @param resId ID of a menu resource to inflate
      */
     public void inflateMenu(int resId) {
-        mPresenter.setUpdateSuspended(true);
+        if (mPresenter != null) {
+            mPresenter.setUpdateSuspended(true);
+        }
         getMenuInflater().inflate(resId, mMenu);
-        mPresenter.setUpdateSuspended(false);
-        mPresenter.updateMenuView(false);
+        if (mPresenter != null) {
+            mPresenter.setUpdateSuspended(false);
+            mPresenter.updateMenuView(false);
+        }
     }
 
     /**