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

Commit 2c58226f authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2de4b23eab41d5efbcee9aac59f4a51e8fd6ad12
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68b90940 813b664c

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

+8 −1
Original line number Diff line number Diff line
@@ -2326,7 +2326,7 @@ public final class ActiveServices { 
                            && (r.getConnections().size() > 0)

                            && (r.mDebugWhileInUseReasonInBindService

                            != 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)

                                + " new="

                                + 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) {

        // If we're still within the service's deferral period, then by definition

        // deferral is not rate limited.