device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java - Issue 2105573002: Revert of Add a LocationUtils class to give all Chromium Android code access to location helpers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

Issue 2105573002: Revert of Add a LocationUtils class to give all Chromium Android code access to location helpers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « device/bluetooth/android/java/DEPS ('k') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

index a03283f36af0444a783e4ceee4c6f3631bad5368..a7751f75fab24955e4642b3ad2cca6efb4924bbe 100644

--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

@@ -4,6 +4,7 @@

package org.chromium.device.bluetooth;

+import android.Manifest;

import android.annotation.TargetApi;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.le.ScanSettings;

@@ -189,8 +190,8 @@

private boolean canScan() {

Wrappers.ContextWrapper context = mAdapter.getContext();

- return context.hasAndroidLocationPermission();

+ return context.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION)

+ || context.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION);

}

private void registerBroadcastReceiver() {