From 22e637bfc950bd148b208b4d25af88f45a4c09f9 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Mon, 27 Sep 2021 17:41:07 +0800
Subject: [PATCH] [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
---
 src/com/android/settings/fuelgauge/BatteryInfo.java | 13 +++++++++++--
 .../settings/fuelgauge/BatteryOptimizeUtils.java    |  8 ++++++++
 .../settings/fuelgauge/BatteryUsageStatsLoader.java | 11 ++++++++++-
 .../android/settings/fuelgauge/BatteryUtils.java    | 13 +++++++++++--
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 92151c0c58d..d641e7bef3c 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -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 {
-                    stats = context.getSystemService(BatteryStatsManager.class)
-                            .getBatteryUsageStats();
+                    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);
             }
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index 4a560402667..21d20235f65 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -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);
diff --git a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
index d35ef82b818..2e3200d5835 100644
--- a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
@@ -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();
         }
-        return mBatteryStatsManager.getBatteryUsageStats(builder.build());
+        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
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index d521ed166a1..1c458e1ab91 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -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(
-                new BatteryUsageStatsQuery.Builder().includeBatteryHistory().build());
+        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();