Merge "fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START"...

Merge "fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START" into main am: 0affadc4

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



Change-Id: I6e1235dba1561f63af649049545788778fecafe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -119,8 +119,13 @@ public class TracingServiceProxy extends SystemService {
     }
 
     @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) {