Merge "Instrument Service lifecycle events" into main

This commit is contained in:
Zimuzo Ezeozue
2023-07-25 11:15:22 +00:00
committed by Android (Google) Code Review

View File

@@ -1111,6 +1111,10 @@ public final class ActivityThread extends ClientTransactionHandler
s.token = token;
s.info = info;
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleCreateService. token="
+ token);
}
sendMessage(H.CREATE_SERVICE, s);
}
@@ -1126,6 +1130,11 @@ public final class ActivityThread extends ClientTransactionHandler
if (DEBUG_SERVICE)
Slog.v(TAG, "scheduleBindService token=" + token + " intent=" + intent + " uid="
+ Binder.getCallingUid() + " pid=" + Binder.getCallingPid());
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleBindService. token="
+ token + " bindSeq=" + bindSeq);
}
sendMessage(H.BIND_SERVICE, s);
}
@@ -1135,6 +1144,10 @@ public final class ActivityThread extends ClientTransactionHandler
s.intent = intent;
s.bindSeq = -1;
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleUnbindService. token="
+ token);
}
sendMessage(H.UNBIND_SERVICE, s);
}
@@ -1150,16 +1163,28 @@ public final class ActivityThread extends ClientTransactionHandler
s.flags = ssa.flags;
s.args = ssa.args;
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleServiceArgs. token="
+ token + " startId=" + s.startId);
}
sendMessage(H.SERVICE_ARGS, s);
}
}
public final void scheduleStopService(IBinder token) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleStopService. token="
+ token);
}
sendMessage(H.STOP_SERVICE, token);
}
@Override
public final void scheduleTimeoutService(IBinder token, int startId) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "scheduleTimeoutService. token="
+ token);
}
sendMessage(H.TIMEOUT_SERVICE, token, startId);
}