device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java - Issue 1061303003: [Android] Fix BatteryStatusManagerTest instrumentation tests for devices running L.

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 1061303003: [Android] Fix BatteryStatusManagerTest instrumentation tests for devices running L. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

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

index 8d62538b90ef320eeed1b113494ce729da3cc3fb..d833b2c93b95ed48f34be76e2808a9d7bbd82b17 100644

--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java

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

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

batteryStatus.dischargingTime = dischargingTimeSeconds;

batteryStatus.level = level;

- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

+ if (mLollipopBatteryManager != null) {

updateBatteryStatusForLollipop(batteryStatus);

}

« no previous file with comments | « no previous file | device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java » ('j') | no next file with comments »