diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-06 02:25:28 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-12-06 02:25:28 +0000 |
| commit | dd9dbb4171f4374749c998984f88e35c53b6cad8 (patch) | |
| tree | 9a70571b5bb523d9ba1eb5ff5b28fb55c49b088b | |
| parent | d6a3f5505c4b9872669c6c23c3834ce52939f9fe (diff) | |
| parent | 3e391663b58df16a516259a4cae2464a50d667dc (diff) | |
| download | android_packages_screensavers_PhotoTable-dd9dbb4171f4374749c998984f88e35c53b6cad8.tar.gz android_packages_screensavers_PhotoTable-dd9dbb4171f4374749c998984f88e35c53b6cad8.tar.bz2 android_packages_screensavers_PhotoTable-dd9dbb4171f4374749c998984f88e35c53b6cad8.zip | |
Merge tag 'android-4.4.1_r1' into HEAD
Android 4.4.1 Release 1
| -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); |