From 17bd2d15dd9630dabf8defb353fdda8ba379f528 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 16 Oct 2013 12:53:11 -0400
Subject: fix race condition in photo dreams settings activity

Bug: 11225307
Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07
---
 src/com/android/dreams/phototable/FlipperDreamSettings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 class FlipperDreamSettings extends ListActivity {
     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);
-- 
cgit v1.2.3