device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java - Issue 2100313003: bluetooth: Remove Context from Wrappers and use LocationUtils directly

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 2100313003: bluetooth: Remove Context from Wrappers and use LocationUtils directly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-location-utils

Patch Set: remove new line 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/BUILD.gn ('k') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java » ('j') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java » ('J')
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 a320bfd0b1de44d643d795faff9d73b8a86f9aa7..8659685aed718444c70c662810ac26420241f570 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

@@ -17,6 +17,7 @@ import android.os.ParcelUuid;

import org.chromium.base.Log;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

+import org.chromium.components.location.LocationUtils;

import java.util.List;

@@ -207,9 +208,9 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {

* @return true if Chromium has permission to scan for Bluetooth devices.

private boolean canScan() {

- Wrappers.ContextWrapper context = mAdapter.getContext();

+ Context context = mAdapter.getContext();

- return context.hasAndroidLocationPermission();

+ return LocationUtils.getInstance().hasAndroidLocationPermission(context);

}

private void registerBroadcastReceiver() {