diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-16 19:46:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-16 19:46:34 +0000 |
| commit | 561f8821e976cfcdd5503e1b645417ef6506a995 (patch) | |
| tree | 382c61611483b47eab1dce7608804296d0fb7805 /src/com/android/bluetooth/btservice | |
| parent | ff125cce1a5689a64e0eb4810851c3ef4304a1d3 (diff) | |
| parent | a1772b03b58d2821a621b40b7e8d1dba1213a556 (diff) | |
| download | android_packages_apps_Bluetooth-561f8821e976cfcdd5503e1b645417ef6506a995.tar.gz android_packages_apps_Bluetooth-561f8821e976cfcdd5503e1b645417ef6506a995.tar.bz2 android_packages_apps_Bluetooth-561f8821e976cfcdd5503e1b645417ef6506a995.zip | |
Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
Diffstat (limited to 'src/com/android/bluetooth/btservice')
| -rw-r--r-- | src/com/android/bluetooth/btservice/ProfileService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/btservice/ProfileService.java b/src/com/android/bluetooth/btservice/ProfileService.java index d02924982..1b70944ae 100644 --- a/src/com/android/bluetooth/btservice/ProfileService.java +++ b/src/com/android/bluetooth/btservice/ProfileService.java @@ -174,7 +174,8 @@ public abstract class ProfileService extends Service { @Override public void onDestroy() { if (DBG) log("Destroying service."); - mAdapterService.removeProfile(this); + if (mAdapterService != null) mAdapterService.removeProfile(this); + if (mCleaningUp) { if (DBG) log("Cleanup already started... Skipping cleanup()..."); } else { |