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

Commit 1cfd031c authored by Adam Lesinski's avatar Adam Lesinski Committed by The Android Automerger
Browse files

Fix crash when no power_profile is specified 

Always connected devices don't have power_profiles,
so handle the case where the default cpu speed count of
1 is used on a device with more cpu speeds.

Bug:23776983
Change-Id: Ifdddad2f28eea5b730833622a6b6043b3086efd2
parent 6b8e7a0b

core/java/com/android/internal/os/KernelCpuSpeedReader.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class KernelCpuSpeedReader { 
            TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter(' ');

            String line;

            int speedIndex = 0;

            while ((line = reader.readLine()) != null) {

            while (speedIndex < mLastSpeedTimes.length && (line = reader.readLine()) != null) {

                splitter.setString(line);

                Long.parseLong(splitter.next());

core/java/com/android/internal/os/KernelUidCpuTimeReader.java

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class KernelUidCpuTimeReader { 
                mLastPowerMaUs.put(uid, powerMaUs);

            }

        } catch (IOException e) {

            Slog.e(TAG, "Failed to read uid_cputime", e);

            Slog.e(TAG, "Failed to read uid_cputime: " + e.getMessage());

        }

        mLastTimeReadUs = nowUs;

    }