commit 3e391663b58df16a516259a4cae2464a50d667dc
author Chris Wren <cwren@android.com> Fri Oct 18 10:43:11 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 18 10:43:11 2013 -0700
tree ed08ee138964c578cbd72762222d08aca6eb11dd
parent 873939ad38eb8d36e2a5c4ae697d69e0850ffe37
parent 17bd2d15dd9630dabf8defb353fdda8ba379f528

am 17bd2d15: fix race condition in photo dreams settings activity

* commit '17bd2d15dd9630dabf8defb353fdda8ba379f528':
  fix race condition in photo dreams settings activity

src/com/android/dreams/phototable/FlipperDreamSettings.java

diff --git a/src/com/android/dreams/phototable/FlipperDreamSettings.java b/src/com/android/dreams/phototable/FlipperDreamSettings.java
index 464029e..cd24721 100644
--- a/src/com/android/dreams/phototable/FlipperDreamSettings.java
+++ b/src/com/android/dreams/phototable/FlipperDreamSettings.java
@@ -108,7 +108,9 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
         case R.id.photodream_menu_all:
-            mAdapter.selectAll(!mAdapter.areAllSelected());
+            if (mAdapter != null) {
+                mAdapter.selectAll(!mAdapter.areAllSelected());
+            }
             return true;
         default:
             return super.onOptionsItemSelected(item);