Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't let transition tracing exceptions bubble up

Browse Source 
So that the tracing can never cause a transition to fail.

Test: n/a
Bug: 281929591
Change-Id: I805b2ccfa0dbfc6db375692ad5fc368005d4bd1d
This commit is contained in:
Pablo Gamito
2023-05-12 14:19:34 +00:00
parent 2d3194900d
commit f68c8e42f3
2 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Transition.java
View File

@@ -1516,7 +1516,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
mController.mLoggerHandler.post(mLogger::logOnSend);
if (mLogger.mInfo != null) {
mController.mTransitionTracer.logSentTransition(this, mTargets, info);
mController.mTransitionTracer.logSentTransition(this, mTargets);
}
}

82
services/core/java/com/android/server/wm/TransitionTracer.java
View File

@@ -29,7 +29,6 @@ import android.os.SystemClock;
import android.os.Trace;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
import android.window.TransitionInfo;
import com.android.internal.util.TraceBuffer;
import com.android.server.wm.Transition.ChangeInfo;
@@ -69,26 +68,29 @@ public class TransitionTracer {
*
* @param transition The transition that has been sent to Shell.
* @param targets Information about the target windows of the transition.
* @param info The TransitionInfo send over to Shell to execute the transition.
*/
public void logSentTransition(Transition transition, ArrayList<ChangeInfo> targets,
TransitionInfo info) {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.CREATE_TIME_NS,
transition.mLogger.mCreateTimeNs);
outputStream.write(com.android.server.wm.shell.Transition.SEND_TIME_NS,
transition.mLogger.mSendTimeNs);
outputStream.write(com.android.server.wm.shell.Transition.START_TRANSACTION_ID,
transition.getStartTransaction().getId());
outputStream.write(com.android.server.wm.shell.Transition.FINISH_TRANSACTION_ID,
transition.getFinishTransaction().getId());
dumpTransitionTargetsToProto(outputStream, transition, targets);
outputStream.end(protoToken);
public void logSentTransition(Transition transition, ArrayList<ChangeInfo> targets) {
try {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.CREATE_TIME_NS,
transition.mLogger.mCreateTimeNs);
outputStream.write(com.android.server.wm.shell.Transition.SEND_TIME_NS,
transition.mLogger.mSendTimeNs);
outputStream.write(com.android.server.wm.shell.Transition.START_TRANSACTION_ID,
transition.getStartTransaction().getId());
outputStream.write(com.android.server.wm.shell.Transition.FINISH_TRANSACTION_ID,
transition.getFinishTransaction().getId());
dumpTransitionTargetsToProto(outputStream, transition, targets);
outputStream.end(protoToken);
mTraceBuffer.add(outputStream);
mTraceBuffer.add(outputStream);
} catch (Exception e) {
// Don't let any errors in the tracing cause the transition to fail
Log.e(LOG_TAG, "Unexpected exception thrown while logging transitions", e);
}
}
/**
@@ -98,15 +100,20 @@ public class TransitionTracer {
* @param transition The transition that has finished.
*/
public void logFinishedTransition(Transition transition) {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.FINISH_TIME_NS,
transition.mLogger.mFinishTimeNs);
outputStream.end(protoToken);
try {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.FINISH_TIME_NS,
transition.mLogger.mFinishTimeNs);
outputStream.end(protoToken);
mTraceBuffer.add(outputStream);
mTraceBuffer.add(outputStream);
} catch (Exception e) {
// Don't let any errors in the tracing cause the transition to fail
Log.e(LOG_TAG, "Unexpected exception thrown while logging transitions", e);
}
}
/**
@@ -116,15 +123,20 @@ public class TransitionTracer {
* @param transition The transition that has been aborted
*/
public void logAbortedTransition(Transition transition) {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.ABORT_TIME_NS,
transition.mLogger.mAbortTimeNs);
outputStream.end(protoToken);
try {
final ProtoOutputStream outputStream = new ProtoOutputStream();
final long protoToken = outputStream
.start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);
outputStream.write(com.android.server.wm.shell.Transition.ID, transition.getSyncId());
outputStream.write(com.android.server.wm.shell.Transition.ABORT_TIME_NS,
transition.mLogger.mAbortTimeNs);
outputStream.end(protoToken);
mTraceBuffer.add(outputStream);
mTraceBuffer.add(outputStream);
} catch (Exception e) {
// Don't let any errors in the tracing cause the transition to fail
Log.e(LOG_TAG, "Unexpected exception thrown while logging transitions", e);
}
}
private void dumpTransitionTargetsToProto(ProtoOutputStream outputStream,