diff options
| author | Ramesh Garimella <quic_rgarimel@quicinc.com> | 2022-04-18 06:50:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-18 06:50:42 +0000 |
| commit | ded60454d9693979b5d30128beb0e34f4f290199 (patch) | |
| tree | fa58b409d4236b44dc361316fbf0cd6b8eab4de9 | |
| parent | 225546d72883cb58afa599751f48feb90092c0e1 (diff) | |
| parent | c543e541bd9eea77be25c314f29a8ee0eb40f8e5 (diff) | |
Merge "Perf:Fix the issue that activity boost duration abnormal" into s-keystone-qcom-dev
| -rwxr-xr-x[-rw-r--r--] | services/core/java/com/android/server/wm/ActivityRecord.java | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | services/core/java/com/android/server/wm/ActivityStarter.java | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index c50f266d4f42..e4ee577d1aea 100644..100755 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -6240,6 +6240,12 @@ public final class ActivityRecord extends WindowToken implements WindowManagerSe /** Called when the windows associated app window container are drawn. */ private void onWindowsDrawn(long timestampNs) { + if (mPerf != null && perfActivityBoostHandler > 0) { + mPerf.perfLockReleaseHandler(perfActivityBoostHandler); + perfActivityBoostHandler = -1; + } else if (perfActivityBoostHandler > 0) { + Slog.w(TAG, "activity boost didn't release as expected"); + } final TransitionInfoSnapshot info = mTaskSupervisor .getActivityMetricsLogger().notifyWindowsDrawn(this, timestampNs); final boolean validInfo = info != null; diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index 606acf02eaa4..177aa61381c1 100644..100755 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -1783,6 +1783,10 @@ class ActivityStarter { BoostFramework.VENDOR_HINT_FIRST_LAUNCH_BOOST, packageName, -1, BoostFramework.Launch.BOOST_V1, 1, pkgType); } else { + if (mStartActivity.perfActivityBoostHandler > 0) { + Slog.i(TAG, "Activity boosted, release it firstly"); + mPerf.perfLockReleaseHandler(mStartActivity.perfActivityBoostHandler); + } mStartActivity.perfActivityBoostHandler = mPerf.perfHint(BoostFramework.VENDOR_HINT_FIRST_LAUNCH_BOOST, packageName, -1, BoostFramework.Launch.BOOST_V1); @@ -2834,6 +2838,10 @@ class ActivityStarter { BoostFramework.VENDOR_HINT_FIRST_LAUNCH_BOOST, packageName, -1, BoostFramework.Launch.BOOST_V1, 1, pkgType); } else { + if (mStartActivity.perfActivityBoostHandler > 0) { + Slog.i(TAG, "Activity boosted, release it firstly"); + mPerf.perfLockReleaseHandler(mStartActivity.perfActivityBoostHandler); + } mStartActivity.perfActivityBoostHandler = mPerf.perfHint(BoostFramework.VENDOR_HINT_FIRST_LAUNCH_BOOST, packageName, -1, BoostFramework.Launch.BOOST_V1); |