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

Commit e0690620 authored by Lakshman Annadorai's avatar Lakshman Annadorai Committed by Automerger Merge Worker
Browse files

Merge "Handle negative CPU availability percent in CpuMonitorService." into udc-dev am: 5b3b9324 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22819878



Change-Id: I4ce11b558ca0faaef0d738cc5eff7ad439579529
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27c561f8 5b3b9324

services/core/java/com/android/server/cpu/CpuMonitorService.java

+10 −1
Original line number Diff line number Diff line
@@ -653,8 +653,17 @@ public final class CpuMonitorService extends SystemService { 
            }



            public int getAverageAvailableCpuFreqPercent() {

                return (int) ((totalNormalizedAvailableCpuFreqKHz * 100.0)

                int percent = (int) ((totalNormalizedAvailableCpuFreqKHz * 100.0)

                        / totalOnlineMaxCpuFreqKHz);

                if (percent < 0) {

                    // TODO(b/279478586): This case should never happen. But this case happens

                    // rarely on certain hardware, which indicates a deeper issue. Once this

                    // issue is reproduced, use this log to debug the issue and fix it.

                    Slogf.wtf(TAG, "Computed negative CPU availability percent(%d) for %s ",

                            percent, toString());

                    return 0;

                }

                return percent;

            }



            @Override