summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-11-04 13:13:49 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-04 13:13:49 -0700
commitf4fe3648555cd787aae9811f4281f3bb39e26c11 (patch)
tree5aead90d9babd8c33b785412b9a786867abaac02
parent26d0126fe5754d57f8fad8e4342db0ce52d8fe47 (diff)
parentb1c9efb6550a7e39ec41c00b08f853279b855ce9 (diff)
downloadandroid_packages_apps_AudioFX-f4fe3648555cd787aae9811f4281f3bb39e26c11.tar.gz
android_packages_apps_AudioFX-f4fe3648555cd787aae9811f4281f3bb39e26c11.tar.bz2
android_packages_apps_AudioFX-f4fe3648555cd787aae9811f4281f3bb39e26c11.zip
Merge "AudioFX: Fix possible NPE" into cm-13.0
-rw-r--r--src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java b/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java
index 89e4b91..babf045 100644
--- a/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/AudioFxFragment.java
@@ -327,7 +327,9 @@ public class AudioFxFragment extends Fragment implements StateCallbacks.DeviceCh
}
}
mMenuDevices.getSubMenu().setGroupCheckable(R.id.devices, true, true);
- selectedItem.setChecked(true);
+ if (selectedItem != null) {
+ selectedItem.setChecked(true);
+ }
mMenuDevices.setIcon(selectedItem.getIcon());
}