Fix failed tests since presubmit is ignored in ag/15802168

Bug: 198553245 Test: make SettingsRoboTests Change-Id: I91e715a6bfb64419b457812423996365a9464a93
2021-09-11 16:29:36 +08:00
parent a3b89868f4
commit 27efa546cf
3 changed files with 66 additions and 11 deletions
--- a/src/com/android/settings/fuelgauge/BatteryDiffEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryDiffEntry.java
@@ -113,7 +113,9 @@ public class BatteryDiffEntry {
    /** Gets the app icon {@link Drawable} for this entry. */
    public Drawable getAppIcon() {
        loadLabelAndIcon();
-        return mAppIcon.getConstantState().newDrawable();
+        return mAppIcon != null && mAppIcon.getConstantState() != null
+                ? mAppIcon.getConstantState().newDrawable()
+                : null;
    }

    /** Gets the app icon id for this entry. */