commit 23311d456a77417fa9607029b369f6ce73a376b4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Apr 15 12:06:31 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 15 12:06:31 2024 +0000
tree 71db598c4c21615b597d6188c364296b5cf2303d
parent 0affadc4ca82a569a91c686b1ad38ea8c24a0e5c
parent c21afc29c3a0ea6fe95c24a390f352bbe6bf6b30

Merge "Add metaData null check in isRequiredAppDeclaredInMetadata" into main

services/core/java/com/android/server/tracing/TracingServiceProxy.java

diff --git a/services/core/java/com/android/server/tracing/TracingServiceProxy.java b/services/core/java/com/android/server/tracing/TracingServiceProxy.java
index 10e868d..c1d92cf 100644
--- a/services/core/java/com/android/server/tracing/TracingServiceProxy.java
+++ b/services/core/java/com/android/server/tracing/TracingServiceProxy.java
@@ -119,8 +119,13 @@
     }
 
     @Override
-    public void onStart() {
-        publishBinderService(TRACING_SERVICE_PROXY_BINDER_NAME, mTracingServiceProxy);
+    public void onStart() {}
+
+    @Override
+    public void onBootPhase(int phase) {
+        if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
+            publishBinderService(TRACING_SERVICE_PROXY_BINDER_NAME, mTracingServiceProxy);
+        }
     }
 
     private void notifyTraceur(boolean sessionStolen) {