PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev am: f438abe0d9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038010

Change-Id: Ifbb0ea168a7f099ebaed0c20aa9b8ab1cf1c3dbd
This commit is contained in:
YUKAI HUNG
2021-10-12 11:54:59 +00:00
committed by Automerger Merge Worker
parent 235353a131 f438abe0d9
commit 70ad3f590b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import android.content.Context; import android.content.Context;
import android.os.BatteryUsageStats; import android.os.BatteryUsageStats;
import android.os.UidBatteryConsumer; import android.os.UidBatteryConsumer;
import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -41,6 +42,8 @@ import java.util.concurrent.TimeUnit;
* {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips} * {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips}
*/ */
public class HighUsageDetector implements BatteryTipDetector { public class HighUsageDetector implements BatteryTipDetector {
private static final String TAG = "HighUsageDetector";
private BatteryTipPolicy mPolicy; private BatteryTipPolicy mPolicy;
private BatteryUsageStats mBatteryUsageStats; private BatteryUsageStats mBatteryUsageStats;
private final BatteryInfo mBatteryInfo; private final BatteryInfo mBatteryInfo;
@@ -113,6 +116,10 @@ public class HighUsageDetector implements BatteryTipDetector {
@VisibleForTesting @VisibleForTesting
void parseBatteryData() { void parseBatteryData() {
mBatteryInfo.parseBatteryHistory(mDataParser); try {
mBatteryInfo.parseBatteryHistory(mDataParser);
} catch (IllegalStateException e) {
Log.e(TAG, "parseBatteryData() failed", e);
}
} }
} }