diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 18:46:18 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-06 18:46:18 +0000 |
| commit | d10ef540b0448edd0f1876b744c9ea54b9e4a70d (patch) | |
| tree | 497f62b3768d35405e77215395f06c91e649c8cb /media | |
| parent | 16b62f5084ffdf8b55aafa52aa8eed77b0c94deb (diff) | |
| download | chromium_src-d10ef540b0448edd0f1876b744c9ea54b9e4a70d.zip chromium_src-d10ef540b0448edd0f1876b744c9ea54b9e4a70d.tar.gz chromium_src-d10ef540b0448edd0f1876b744c9ea54b9e4a70d.tar.bz2 | |
Handle platforms with no bluetooth in AudioManagerAndroid.
AudioManagerAndroid will NPE on hardware platforms that don't
have bluetooth.
BUG=401039
Review URL: https://codereview.chromium.org/449463002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java index 8005ddc..cb03a56 100644 --- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java +++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java @@ -664,6 +664,11 @@ class AudioManagerAndroid { btAdapter = BluetoothAdapter.getDefaultAdapter(); } + if (btAdapter == null) { + // Bluetooth not supported on this platform. + return false; + } + int profileConnectionState; profileConnectionState = btAdapter.getProfileConnectionState( android.bluetooth.BluetoothProfile.HEADSET); |