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

Commit 22e637bf authored by ykhung's avatar ykhung Committed by YUKAI HUNG
Browse files

[S-QPR1] protect gettinng battery stats from DeadSystemException 

In some corner cases, we will receive the DeadSystemException from
BatteryStatService when invoking getBatteryUsageStats() method, since it
will encounter the binder transaction too large error. Before the root
cause is resolved by the BatteryStatService team, we have to add
workaround protection in the app side to avoid Setting is crashed.

Bug: 191237968
Bug: 198084535
Test: make SettingsRoboTests
Change-Id: I783479241bac83b4afc8ced3073e1b1db302c48c
Merged-In: I75fcf63f4f69d86d6dce0e12bd4d738b1219ae47
parent 1aff9c72

src/com/android/settings/fuelgauge/BatteryInfo.java

+11 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.BatteryStatsManager; 
import android.os.BatteryUsageStats;

import android.os.SystemClock;

import android.text.format.Formatter;

import android.util.Log;

import android.util.SparseIntArray;



import androidx.annotation.NonNull;
@@ -42,6 +43,7 @@ import com.android.settingslib.utils.PowerUtil; 
import com.android.settingslib.utils.StringUtil;



public class BatteryInfo {

    private static final String TAG = "BatteryInfo";



    public CharSequence chargeLabel;

    public CharSequence remainingLabel;
@@ -155,8 +157,15 @@ public class BatteryInfo { 
                if (batteryUsageStats != null) {

                    stats = batteryUsageStats;

                } else {

                    try {

                        stats = context.getSystemService(BatteryStatsManager.class)

                                .getBatteryUsageStats();

                    } catch (RuntimeException e) {

                        Log.e(TAG, "getBatteryInfo() from getBatteryUsageStats()", e);

                        // Use default BatteryUsageStats.

                        stats = new BatteryUsageStats.Builder(

                                new String[0], /* includePowerModels */ false).build();

                    }

                }

                return getBatteryInfo(context, stats, shortString);

            }

src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ public class BatteryOptimizeUtils { 
    }



    public void setAppUsageState(AppUsageState state) {

        try {

            setAppUsageStateInternal(state);

        } catch (Exception e) {

            Log.e(TAG, "setAppUsageState() is failed for " + mPackageName, e);

        }

    }



    private void setAppUsageStateInternal(AppUsageState state) {

        switch (state) {

            case RESTRICTED:

                mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_IGNORED);

src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.os.BatteryStatsManager;

import android.os.BatteryUsageStats;

import android.os.BatteryUsageStatsQuery;

import android.util.Log;



import com.android.settingslib.utils.AsyncLoaderCompat;
@@ -27,6 +28,7 @@ import com.android.settingslib.utils.AsyncLoaderCompat; 
 * Loader to get new {@link BatteryUsageStats} in the background

 */

public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats> {

    private static final String TAG = "BatteryUsageStatsLoader";

    private final BatteryStatsManager mBatteryStatsManager;

    private final boolean mIncludeBatteryHistory;
@@ -42,7 +44,14 @@ public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats 
        if (mIncludeBatteryHistory) {

            builder.includeBatteryHistory();

        }

        try {

            return mBatteryStatsManager.getBatteryUsageStats(builder.build());

        } catch (RuntimeException e) {

            Log.e(TAG, "loadInBackground() for getBatteryUsageStats()", e);

            // Use default BatteryUsageStats.

            return new BatteryUsageStats.Builder(

                    new String[0], /* includePowerModels */ false).build();

        }

    }



    @Override

src/com/android/settings/fuelgauge/BatteryUtils.java

+11 −2
Original line number Diff line number Diff line
@@ -368,8 +368,17 @@ public class BatteryUtils { 
    public BatteryInfo getBatteryInfo(final String tag) {

        final BatteryStatsManager systemService = mContext.getSystemService(

                BatteryStatsManager.class);

        final BatteryUsageStats batteryUsageStats = systemService.getBatteryUsageStats(

        BatteryUsageStats batteryUsageStats;

        try {

            batteryUsageStats = systemService.getBatteryUsageStats(

                    new BatteryUsageStatsQuery.Builder().includeBatteryHistory().build());

        } catch (RuntimeException e) {

            Log.e(TAG, "getBatteryInfo() error for getBatteryUsageStats()", e);

            // Use default BatteryUsageStats.

            batteryUsageStats =

                    new BatteryUsageStats.Builder(new String[0], /* includePowerModels */ false)

                            .build();

        }



        final long startTime = System.currentTimeMillis();