diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 12:02:58 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 12:02:58 +0000 |
| commit | b6b6f0c7bb8e6321a06c3c3f501beae0a0d8a22b (patch) | |
| tree | cc8e5fe34a423903cffef452a7ae48c1f16ba192 | |
| parent | 9e0cebf6c7a84512095b6bcbc4ae50a78d31152c (diff) | |
| download | chromium_src-b6b6f0c7bb8e6321a06c3c3f501beae0a0d8a22b.zip chromium_src-b6b6f0c7bb8e6321a06c3c3f501beae0a0d8a22b.tar.gz chromium_src-b6b6f0c7bb8e6321a06c3c3f501beae0a0d8a22b.tar.bz2 | |
Merge 287813 "Handle platforms with no bluetooth in AudioManager..."
> 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
TBR=benm@chromium.org
Review URL: https://codereview.chromium.org/462003002
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@288942 0039d316-1c4b-4281-b951-d872f2087c98
| -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); |