diff options
| author | root <voodik.am@gmail.com> | 2015-05-31 13:52:43 +0400 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-03-10 07:19:41 +0100 |
| commit | 7784b2d3ead321ed1bcc48fcfd129c0654eb8d60 (patch) | |
| tree | 1bfe85cc3c2690916044f6ba2d9f1ab879bd17d6 | |
| parent | 9b7a13a66bb4b55eba855567432bff1f718cc35d (diff) | |
| download | android_packages_apps_Gallery2-7784b2d3ead321ed1bcc48fcfd129c0654eb8d60.tar.gz android_packages_apps_Gallery2-7784b2d3ead321ed1bcc48fcfd129c0654eb8d60.tar.bz2 android_packages_apps_Gallery2-7784b2d3ead321ed1bcc48fcfd129c0654eb8d60.zip | |
Gallery2: Fix crash when Bluetooth service is disabled
Change-Id: I3dd2741d3d6fe3a3cf6ffa0a6ceeb9c1374bd8f8
| -rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 150b3807f..60f066642 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -664,8 +664,9 @@ public class MovieActivity extends AbstractPermissionActivity { private boolean isBtHeadsetConnected() { BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - if ((BluetoothProfile.STATE_CONNECTED == adapter.getProfileConnectionState(BluetoothProfile.HEADSET)) - || (BluetoothProfile.STATE_CONNECTED == adapter.getProfileConnectionState(BluetoothProfile.A2DP))) { + if (adapter != null && adapter.isEnabled() && + (BluetoothProfile.STATE_CONNECTED == adapter.getProfileConnectionState(BluetoothProfile.HEADSET) + || BluetoothProfile.STATE_CONNECTED == adapter.getProfileConnectionState(BluetoothProfile.A2DP))) { return true; } return false; |