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

Commit 6f25b30e authored by Kunal's avatar Kunal
Browse files

Adding null check for stat closing 

Bug: 300996262
Test: atest FrameworksMockingServicesTests -- --abi x86_64
Change-Id: If85c705a85a6daf954e202aca409d6af1362ba85
parent 1a7c36f7

services/core/java/com/android/server/am/AppBatteryTracker.java

+15 −3
Original line number Diff line number Diff line
@@ -580,7 +580,11 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
                            batteryStatsInternal);

            curDuration += curStart - lastUidBatteryUsageStartTs;

            try {

                if (statsCommit != null) {

                    statsCommit.close();

                } else {

                    Slog.w(TAG, "Stat was null");

                }

            } catch (IOException e) {

                Slog.w(TAG, "Failed to close a stat");

            }
@@ -660,7 +664,11 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
            }

        }

        try {

            if (stats != null) {

                stats.close();

            } else {

                Slog.w(TAG, "Stat was null");

            }

        } catch (IOException e) {

            Slog.w(TAG, "Failed to close a stat");

        }
@@ -684,7 +692,11 @@ final class AppBatteryTracker extends BaseAppStateTracker<AppBatteryPolicy> 
        final BatteryUsageStats stats = statsList.get(0);

        for (int i = 1; i < statsList.size(); i++) {

            try {

                if (statsList.get(i) != null) {

                    statsList.get(i).close();

                } else {

                    Slog.w(TAG, "Stat was null");

                }

            } catch (IOException e) {

                Slog.w(TAG, "Failed to close a stat in BatteryUsageStats List");

            }