commit 17bd2d15dd9630dabf8defb353fdda8ba379f528
author Chris Wren <cwren@android.com> Wed Oct 16 12:53:11 2013 -0400
committer Chris Wren <cwren@android.com> Wed Oct 16 12:53:11 2013 -0400
tree c0a5e08f62b083d5c98416aa9b87983e8ed8bf02
parent 44358fd113ad0ac82aa093e66d906ce40528d24f

fix race condition in photo dreams settings activity

Bug: 11225307
Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07

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);