Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6e52a5b authored by YUKAI HUNG's avatar YUKAI HUNG Committed by Automerger Merge Worker
Browse files

Merge "Add try-catch to avoid IllegalStateException in the data parsing" into... 

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

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

Change-Id: I59602b4653741017b50a4e2bcff6d5e00fb89975
parents e65d3ab1 70ad3f59

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);

        }

    }

}