| Index: chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
|
| index 3483a645626c69f58936686326bf4dde328c5443..62702d92780684c542a161eacc63d98688af11b1 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
|
| @@ -13,6 +13,7 @@ import android.text.SpannableString;
|
| import android.text.TextUtils;
|
| import android.view.View;
|
|
|
| +import org.chromium.base.LocationUtils;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.chrome.R;
|
| @@ -161,8 +162,7 @@ public class BluetoothChooserDialog
|
| }
|
|
|
| private void checkLocationPermission() {
|
| - if (mWindowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
|
| - || mWindowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
|
| + if (LocationUtils.getInstance().chromiumHasLocationPermission(mActivity)) {
|
| return;
|
| }
|
|
|
| @@ -255,8 +255,8 @@ public class BluetoothChooserDialog
|
| @CalledByNative
|
| private static BluetoothChooserDialog create(WindowAndroid windowAndroid, String origin,
|
| int securityLevel, long nativeBluetoothChooserDialogPtr) {
|
| - if (!windowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
|
| - && !windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
|
| + if (!LocationUtils.getInstance().chromiumHasLocationPermission(
|
| + windowAndroid.getActivity().get())
|
| && !windowAndroid.canRequestPermission(
|
| Manifest.permission.ACCESS_COARSE_LOCATION)) {
|
| // If we can't even ask for enough permission to scan for Bluetooth devices, don't open
|
|
|