device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java - Issue 685703002: Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service"

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/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

Issue 685703002: Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Tim's comments. Created 6 years, 2 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/battery/android/battery_jni_registrar.cc ('k') | device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

similarity index 94%

rename from content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java

rename to device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

index 068961b64bf6c3c5dc0916a69848ef4a26585ee0..90c0f38f68bd9e590fa898cf3d53347fa00ef4ea 100644

--- a/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java

+++ b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.content.browser;

+package org.chromium.device.battery;

import android.content.BroadcastReceiver;

import android.content.Context;

@@ -19,7 +19,7 @@ import org.chromium.base.VisibleForTesting;

/**

* Android implementation of the battery status APIs.

-@JNINamespace("content")

+@JNINamespace("device")

class BatteryStatusManager {

private static final String TAG = "BatteryStatusManager";

@@ -88,8 +88,8 @@ class BatteryStatusManager {

return;

}

- boolean present = ignoreBatteryPresentState() ?

- true : intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);

+ boolean present = ignoreBatteryPresentState()

+ ? true : intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);

int pluggedStatus = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);

if (!present || pluggedStatus == -1) {

@@ -141,7 +141,7 @@ class BatteryStatusManager {

/**

* Native JNI call

- * see content/browser/battery_status/battery_status_manager.cc

+ * see device/battery/battery_status_manager_android.cc

private native void nativeGotBatteryStatus(long nativeBatteryStatusManagerAndroid,

boolean charging, double chargingTime, double dischargingTime, double level);