Merge "Extract WTF to a separate method for easier search" into udc-dev am: 813b664c00

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

Change-Id: I2de4b23eab41d5efbcee9aac59f4a51e8fd6ad12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Makoto Onuki
2023-05-09 23:49:26 +00:00
committed by Automerger Merge Worker

View File

@@ -2326,7 +2326,7 @@ public final class ActiveServices {
&& (r.getConnections().size() > 0) && (r.getConnections().size() > 0)
&& (r.mDebugWhileInUseReasonInBindService && (r.mDebugWhileInUseReasonInBindService
!= r.mDebugWhileInUseReasonInStartForeground)) { != r.mDebugWhileInUseReasonInStartForeground)) {
Slog.wtf(TAG, "FGS while-in-use changed (b/276963716): old=" logWhileInUseChangeWtf("FGS while-in-use changed (b/276963716): old="
+ reasonCodeToString(r.mDebugWhileInUseReasonInBindService) + reasonCodeToString(r.mDebugWhileInUseReasonInBindService)
+ " new=" + " new="
+ reasonCodeToString(r.mDebugWhileInUseReasonInStartForeground) + reasonCodeToString(r.mDebugWhileInUseReasonInStartForeground)
@@ -2589,6 +2589,13 @@ public final class ActiveServices {
} }
} }
/**
* It just does a wtf, but extracted to a method, so we can do a signature search on pitot.
*/
private void logWhileInUseChangeWtf(String message) {
Slog.wtf(TAG, message);
}
private boolean withinFgsDeferRateLimit(ServiceRecord sr, final long now) { private boolean withinFgsDeferRateLimit(ServiceRecord sr, final long now) {
// If we're still within the service's deferral period, then by definition // If we're still within the service's deferral period, then by definition
// deferral is not rate limited. // deferral is not rate limited.