From 719ab5e4ecf4a386dbc74d3c095722b0e5f0ed72 Mon Sep 17 00:00:00 2001 From: Anthony Agby Date: Thu, 12 Oct 2017 17:58:40 -0400 Subject: [PATCH] Null check for batteryStatus - add in a null check for batteryStatus - takes care of bug associated with YotaPhone --- .../services/android/telemetry/MapboxTelemetry.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java index 32ac60311..cd033764f 100644 --- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java +++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java @@ -367,12 +367,13 @@ private int getBatteryLevel() { * @return true if plugged in, false if not */ private boolean isPluggedIn() { - int chargePlug = batteryStatus.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); - if (chargePlug == BatteryManager.BATTERY_PLUGGED_USB - || chargePlug == BatteryManager.BATTERY_PLUGGED_AC) { - return true; + if (batteryStatus != null) { + int chargePlug = batteryStatus.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); + if (chargePlug == BatteryManager.BATTERY_PLUGGED_USB + || chargePlug == BatteryManager.BATTERY_PLUGGED_AC) { + return true; + } } - return false; }