diff options
| author | Chris Wren <cwren@android.com> | 2013-10-18 11:21:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-18 11:21:32 -0700 |
| commit | 5658ca5457d80ecc515a3b6a29afbdc46ffef236 (patch) | |
| tree | c0a5e08f62b083d5c98416aa9b87983e8ed8bf02 | |
| parent | e22e0aaa7337b8ace6e8b73427aac12fb70239be (diff) | |
| parent | 3e391663b58df16a516259a4cae2464a50d667dc (diff) | |
| download | android_packages_screensavers_PhotoTable-5658ca5457d80ecc515a3b6a29afbdc46ffef236.tar.gz android_packages_screensavers_PhotoTable-5658ca5457d80ecc515a3b6a29afbdc46ffef236.tar.bz2 android_packages_screensavers_PhotoTable-5658ca5457d80ecc515a3b6a29afbdc46ffef236.zip | |
am 3e391663: am 17bd2d15: fix race condition in photo dreams settings activity
* commit '3e391663b58df16a516259a4cae2464a50d667dc':
fix race condition in photo dreams settings activity
| -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); |