Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

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

Issue 2847523002: Android: Remove GetApplicationContext part 4 (Closed)
Patch Set: Rebase and fix build Created 3 years, 7 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
Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
index 66c2d29bbd67ca25e624a9127791e9001d82da50..66f0f68c6b4fa15da761f3901ce4e1b29f22728d 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
import android.os.Build;
import android.os.ParcelUuid;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
@@ -110,7 +111,7 @@ class Wrappers {
* permissions.
*/
@CalledByNative("BluetoothAdapterWrapper")
- public static BluetoothAdapterWrapper createWithDefaultAdapter(Context context) {
+ public static BluetoothAdapterWrapper createWithDefaultAdapter() {
final boolean hasMinAPI = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
if (!hasMinAPI) {
Log.i(TAG, "BluetoothAdapterWrapper.create failed: SDK version (%d) too low.",
@@ -119,9 +120,11 @@ class Wrappers {
}
final boolean hasPermissions =
- context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH)
+ ContextUtils.getApplicationContext().checkCallingOrSelfPermission(
+ Manifest.permission.BLUETOOTH)
== PackageManager.PERMISSION_GRANTED
- && context.checkCallingOrSelfPermission(Manifest.permission.BLUETOOTH_ADMIN)
+ && ContextUtils.getApplicationContext().checkCallingOrSelfPermission(
+ Manifest.permission.BLUETOOTH_ADMIN)
== PackageManager.PERMISSION_GRANTED;
if (!hasPermissions) {
Log.w(TAG, "BluetoothAdapterWrapper.create failed: Lacking Bluetooth permissions.");
@@ -131,7 +134,7 @@ class Wrappers {
// Only Low Energy currently supported, see BluetoothAdapterAndroid class note.
final boolean hasLowEnergyFeature =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
- && context.getPackageManager().hasSystemFeature(
+ && ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature(
PackageManager.FEATURE_BLUETOOTH_LE);
if (!hasLowEnergyFeature) {
Log.i(TAG, "BluetoothAdapterWrapper.create failed: No Low Energy support.");
@@ -143,7 +146,7 @@ class Wrappers {
Log.i(TAG, "BluetoothAdapterWrapper.create failed: Default adapter not found.");
return null;
} else {
- return new BluetoothAdapterWrapper(adapter, context);
+ return new BluetoothAdapterWrapper(adapter, ContextUtils.getApplicationContext());
}
}

Powered by Google App Engine
This is Rietveld 408576698