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

Unified Diff: content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java

Issue 657163004: Fix Java indentation issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java b/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java
index d932540caaa36060e41ae0a72001f10cace54af7..068961b64bf6c3c5dc0916a69848ef4a26585ee0 100644
--- a/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java
@@ -83,41 +83,41 @@ class BatteryStatusManager {
@VisibleForTesting
void onReceive(Intent intent) {
- if (!intent.getAction().equals(Intent.ACTION_BATTERY_CHANGED)) {
- Log.e(TAG, "Unexpected intent.");
- return;
- }
-
- boolean present = ignoreBatteryPresentState() ?
- true : intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);
- int pluggedStatus = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
-
- if (!present || pluggedStatus == -1) {
- // No battery or no plugged status: return default values.
- gotBatteryStatus(true, 0, Double.POSITIVE_INFINITY, 1);
- return;
- }
-
- boolean charging = pluggedStatus != 0;
- int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
- boolean batteryFull = status == BatteryManager.BATTERY_STATUS_FULL;
-
- int current = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
- int max = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
- double level = (double) current / (double) max;
- if (level < 0 || level > 1) {
- // Sanity check, assume default value in this case.
- level = 1.0;
- }
-
- // Currently Android does not provide charging/discharging time, as a work-around
- // we could compute it manually based on level delta.
- // TODO(timvolodine): add proper projection for chargingTime, dischargingTime
- // (see crbug.com/401553).
- double chargingTime = (charging & batteryFull) ? 0 : Double.POSITIVE_INFINITY;
- double dischargingTime = Double.POSITIVE_INFINITY;
-
- gotBatteryStatus(charging, chargingTime, dischargingTime, level);
+ if (!intent.getAction().equals(Intent.ACTION_BATTERY_CHANGED)) {
+ Log.e(TAG, "Unexpected intent.");
+ return;
+ }
+
+ boolean present = ignoreBatteryPresentState() ?
+ true : intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false);
+ int pluggedStatus = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+
+ if (!present || pluggedStatus == -1) {
+ // No battery or no plugged status: return default values.
+ gotBatteryStatus(true, 0, Double.POSITIVE_INFINITY, 1);
+ return;
+ }
+
+ boolean charging = pluggedStatus != 0;
+ int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
+ boolean batteryFull = status == BatteryManager.BATTERY_STATUS_FULL;
+
+ int current = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
+ int max = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
+ double level = (double) current / (double) max;
+ if (level < 0 || level > 1) {
+ // Sanity check, assume default value in this case.
+ level = 1.0;
+ }
+
+ // Currently Android does not provide charging/discharging time, as a work-around
+ // we could compute it manually based on level delta.
+ // TODO(timvolodine): add proper projection for chargingTime, dischargingTime
+ // (see crbug.com/401553).
+ double chargingTime = (charging & batteryFull) ? 0 : Double.POSITIVE_INFINITY;
+ double dischargingTime = Double.POSITIVE_INFINITY;
+
+ gotBatteryStatus(charging, chargingTime, dischargingTime, level);
}
/**

Powered by Google App Engine
This is Rietveld 408576698