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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java

Issue 2064323004: Defines initial DeviceConditions and and plumbs down through StartProcessing() call. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 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: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
index 9e195bcd6030e0ed6282d4740642200a147ccbf3..3002a603014b0f8b8da30980bcade936c21973d5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
@@ -201,28 +201,37 @@ public class OfflinePageUtils {
};
}
+ public static DeviceConditions getDeviceConditions(Context context) {
+ IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ // Note this is a sticky intent, so we aren't really registering a receiver, just getting
+ // the sticky intent. That means that we don't need to unregister the filter later.
+ Intent batteryStatus = context.registerReceiver(null, filter);
+ if (batteryStatus == null) return null;
+
+ return new DeviceConditions(isPowerConnected(batteryStatus),
+ batteryPercentage(batteryStatus),
+ NetworkChangeNotifier.getInstance().getCurrentConnectionType());
+ }
+
/**
* Records UMA data when the Offline Pages Background Load service awakens.
* @param context android context
*/
public static void recordWakeupUMA(Context context, long taskScheduledTimeMillis) {
- IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
- // Note this is a sticky intent, so we aren't really registering a receiver, just getting
- // the sticky intent. That means that we don't need to unregister the filter later.
- Intent batteryStatus = context.registerReceiver(null, filter);
- if (batteryStatus == null) return;
+ DeviceConditions deviceConditions = getDeviceConditions(context);
+ if (deviceConditions == null) return;
// Report charging state.
RecordHistogram.recordBooleanHistogram(
- "OfflinePages.Wakeup.ConnectedToPower", isPowerConnected(batteryStatus));
+ "OfflinePages.Wakeup.ConnectedToPower", deviceConditions.isPowerConnected());
// Report battery percentage.
RecordHistogram.recordPercentageHistogram(
- "OfflinePages.Wakeup.BatteryPercentage", batteryPercentage(batteryStatus));
+ "OfflinePages.Wakeup.BatteryPercentage", deviceConditions.getBatteryPercentage());
// Report the default network found (or none, if we aren't connected).
- int connectionType = NetworkChangeNotifier.getInstance().getCurrentConnectionType();
- Log.d(TAG, "Found single network of type " + connectionType);
+ int connectionType = deviceConditions.getNetConnectionType();
+ Log.d(TAG, "Found default network of type " + connectionType);
RecordHistogram.recordEnumeratedHistogram("OfflinePages.Wakeup.NetworkAvailable",
connectionType, ConnectionType.CONNECTION_LAST + 1);

Powered by Google App Engine
This is Rietveld 408576698