diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2014-12-16 08:58:43 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2014-12-16 09:31:50 -0800 |
| commit | a1772b03b58d2821a621b40b7e8d1dba1213a556 (patch) | |
| tree | 6c95a405be825f913682577b75b317ecba820793 /src | |
| parent | 75f77e9970a4b4492e025257fccefcce612bc501 (diff) | |
| download | android_packages_apps_Bluetooth-a1772b03b58d2821a621b40b7e8d1dba1213a556.tar.gz android_packages_apps_Bluetooth-a1772b03b58d2821a621b40b7e8d1dba1213a556.tar.bz2 android_packages_apps_Bluetooth-a1772b03b58d2821a621b40b7e8d1dba1213a556.zip | |
Prevent possible NullPointerException when service is destroyed
Bug: 18757778
Change-Id: Iaf2c8e41a5733379d171f58a35d09c506080fe5d
Diffstat (limited to 'src')
| -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 { |