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

Unified Diff: device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.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
« no previous file with comments | « device/sensors/sensor_manager_android.cc ('k') | device/usb/usb_service_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
diff --git a/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java b/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
index 294442a5482a329effd626330ad69ab3b9a83321..81be9a05d4a837cdc17493021c8a0ddb3a822a9e 100644
--- a/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
+++ b/device/usb/android/java/src/org/chromium/device/usb/ChromeUsbService.java
@@ -13,6 +13,7 @@ import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbDeviceConnection;
import android.hardware.usb.UsbManager;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
@@ -30,22 +31,21 @@ final class ChromeUsbService {
private static final String TAG = "Usb";
private static final String ACTION_USB_PERMISSION = "org.chromium.device.ACTION_USB_PERMISSION";
- Context mContext;
long mUsbServiceAndroid;
UsbManager mUsbManager;
BroadcastReceiver mUsbDeviceReceiver;
- private ChromeUsbService(Context context, long usbServiceAndroid) {
- mContext = context;
+ private ChromeUsbService(long usbServiceAndroid) {
mUsbServiceAndroid = usbServiceAndroid;
- mUsbManager = (UsbManager) mContext.getSystemService(Context.USB_SERVICE);
+ mUsbManager = (UsbManager) ContextUtils.getApplicationContext().getSystemService(
+ Context.USB_SERVICE);
registerForUsbDeviceIntentBroadcast();
Log.v(TAG, "ChromeUsbService created.");
}
@CalledByNative
- private static ChromeUsbService create(Context context, long usbServiceAndroid) {
- return new ChromeUsbService(context, usbServiceAndroid);
+ private static ChromeUsbService create(long usbServiceAndroid) {
+ return new ChromeUsbService(usbServiceAndroid);
}
@CalledByNative
@@ -66,8 +66,8 @@ final class ChromeUsbService {
if (mUsbManager.hasPermission(device)) {
nativeDevicePermissionRequestComplete(mUsbServiceAndroid, device.getDeviceId(), true);
} else {
- PendingIntent intent =
- PendingIntent.getBroadcast(mContext, 0, new Intent(ACTION_USB_PERMISSION), 0);
+ PendingIntent intent = PendingIntent.getBroadcast(
+ ContextUtils.getApplicationContext(), 0, new Intent(ACTION_USB_PERMISSION), 0);
mUsbManager.requestPermission(wrapper.getDevice(), intent);
}
}
@@ -104,11 +104,11 @@ final class ChromeUsbService {
filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
filter.addAction(ACTION_USB_PERMISSION);
- mContext.registerReceiver(mUsbDeviceReceiver, filter);
+ ContextUtils.getApplicationContext().registerReceiver(mUsbDeviceReceiver, filter);
}
private void unregisterForUsbDeviceIntentBroadcast() {
- mContext.unregisterReceiver(mUsbDeviceReceiver);
+ ContextUtils.getApplicationContext().unregisterReceiver(mUsbDeviceReceiver);
mUsbDeviceReceiver = null;
}
}
« no previous file with comments | « device/sensors/sensor_manager_android.cc ('k') | device/usb/usb_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698