summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-11-04 13:13:45 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-04 13:13:45 -0700
commit26d0126fe5754d57f8fad8e4342db0ce52d8fe47 (patch)
treef491953bd4128a159905ef3147f9f1d01bb29366
parenta5a03c2cc113bc89fbb897daba1603367a9d91fe (diff)
parent57e73c474580531513c016f76bb486190685173d (diff)
downloadandroid_packages_apps_AudioFX-26d0126fe5754d57f8fad8e4342db0ce52d8fe47.tar.gz
android_packages_apps_AudioFX-26d0126fe5754d57f8fad8e4342db0ce52d8fe47.tar.bz2
android_packages_apps_AudioFX-26d0126fe5754d57f8fad8e4342db0ce52d8fe47.zip
Merge "AudioFX: Fix possible RuntimeException" into cm-13.0
-rw-r--r--src/org/cyanogenmod/audiofx/service/AudioFxService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/cyanogenmod/audiofx/service/AudioFxService.java b/src/org/cyanogenmod/audiofx/service/AudioFxService.java
index 846c41b..1ec09da 100644
--- a/src/org/cyanogenmod/audiofx/service/AudioFxService.java
+++ b/src/org/cyanogenmod/audiofx/service/AudioFxService.java
@@ -288,7 +288,9 @@ public class AudioFxService extends Service
if (DEBUG) Log.i(TAG, "Stopping service.");
mOutputListener.removeCallback(this, mSessionManager, mDevicePrefs);
- mSessionManager.onDestroy();
+ if (mSessionManager != null) {
+ mSessionManager.onDestroy();
+ }
CMStatusBarManager.getInstance(this).removeTile(TILE_ID);