Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev (f438abe0) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
		import android.content.Context;
		import android.os.BatteryUsageStats;
		import android.os.UidBatteryConsumer;
		import android.util.Log;

		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}
		*/
		public class HighUsageDetector implements BatteryTipDetector {
		private static final String TAG = "HighUsageDetector";

		private BatteryTipPolicy mPolicy;
		private BatteryUsageStats mBatteryUsageStats;
		private final BatteryInfo mBatteryInfo;
		@@ -113,6 +116,10 @@ public class HighUsageDetector implements BatteryTipDetector {

		@VisibleForTesting
		void parseBatteryData() {
		try {
		mBatteryInfo.parseBatteryHistory(mDataParser);
		} catch (IllegalStateException e) {
		Log.e(TAG, "parseBatteryData() failed", e);
		}
		}
		}