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