diff options
| author | Chris Wren <cwren@android.com> | 2013-10-16 12:53:11 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2013-10-16 12:53:11 -0400 |
| commit | 17bd2d15dd9630dabf8defb353fdda8ba379f528 (patch) | |
| tree | c0a5e08f62b083d5c98416aa9b87983e8ed8bf02 /src | |
| parent | 44358fd113ad0ac82aa093e66d906ce40528d24f (diff) | |
| download | android_packages_screensavers_PhotoTable-17bd2d15dd9630dabf8defb353fdda8ba379f528.tar.gz android_packages_screensavers_PhotoTable-17bd2d15dd9630dabf8defb353fdda8ba379f528.tar.bz2 android_packages_screensavers_PhotoTable-17bd2d15dd9630dabf8defb353fdda8ba379f528.zip | |
fix race condition in photo dreams settings activity
Bug: 11225307
Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dreams/phototable/FlipperDreamSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
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); |