Merge "Add component name in FGS WTF log" into udc-qpr-dev

2023-08-14 22:22:13 +00:00
parent a2a56f48c9 dfb9868ba3
commit b1be8a3150
1 changed files with 8 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -286,6 +286,12 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
                + ")");
    }

+    private String getFgsInfoForWtf() {
+        return " cmp: " + this.getComponentName().toShortString()
+                + " sdk: " + this.appInfo.targetSdkVersion
+                ;
+    }
+
    void maybeLogFgsLogicChange() {
        final int origWiu = reasonOr(mAllowWhileInUsePermissionInFgsReasonNoBinding,
                mAllowWIUInBindService);
@@ -311,7 +317,8 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
                + " OS:" // Orig-start
                + changeMessage(mAllowStartForegroundNoBinding, mAllowStartInBindService)
                + " NS:" // New-start
-                + changeMessage(mAllowStartForegroundNoBinding, mAllowStartByBindings);
+                + changeMessage(mAllowStartForegroundNoBinding, mAllowStartByBindings)
+                + getFgsInfoForWtf();
        Slog.wtf(TAG_SERVICE, message);
    }