From 97739e1502858c9e04a9479c4a6a28252bc9cd52 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 31 May 2015 13:52:43 +0400 Subject: Gallery2: Fix crash when Bluetooth service is disabled Change-Id: I2807b0e2be58a0661bb2161d5d894c0191d050b2 --- src/com/android/gallery3d/app/MovieActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 63fb65b62..275b04ab3 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -595,8 +595,9 @@ public class MovieActivity extends Activity { 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; -- cgit v1.2.3