summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lalit Maganti <lalitm@google.com> 2024-04-15 12:03:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-15 12:03:26 +0000
commit88da519f2967660893d44d26c42c965b5542f9ef (patch)
tree21c5c7d265528d7683ee5f59af8df2dd3a167d74
parent6c9627e6b8a82665b6824a10f823e81cea589b12 (diff)
parenta185585973b7ca7be0867b129e051f71367a5f16 (diff)
Merge "fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START" into main am: 0affadc4ca am: a185585973
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039724 Change-Id: Ic6b4fb7598ef4e46a7df152d3b7d8f1964cd09a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/tracing/TracingServiceProxy.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/tracing/TracingServiceProxy.java b/services/core/java/com/android/server/tracing/TracingServiceProxy.java
index 10e868d06766..c1d92cffe1a7 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 @@ 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) {