diff options
| author | root <voodik.am@gmail.com> | 2015-05-31 13:52:43 +0400 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-07-31 00:34:34 +0200 |
| commit | 880d50792bd9f728067a0d42bdc113188cd05b5b (patch) | |
| tree | db91a5f8087bb995de46f055f768c0ee74093d56 /src | |
| parent | 2c75f4004f5c4a2ebe453fa0beda4c27ee8b160d (diff) | |
| download | android_packages_apps_Gallery2-880d50792bd9f728067a0d42bdc113188cd05b5b.tar.gz android_packages_apps_Gallery2-880d50792bd9f728067a0d42bdc113188cd05b5b.tar.bz2 android_packages_apps_Gallery2-880d50792bd9f728067a0d42bdc113188cd05b5b.zip | |
Gallery2: Fix crash when Bluetooth service is disabled
Change-Id: I3dd2741d3d6fe3a3cf6ffa0a6ceeb9c1374bd8f8
Diffstat (limited to 'src')
| -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 811cdca77..223dd332c 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; |