Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099ce71e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13129673 from 312ee292 to 25Q2-release

Change-Id: I9e99285a6eb0d154398d7058ba6ee0e570bf9c61
parents 04a76ebc 312ee292
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ public class FastBitmapDrawable extends Drawable implements Drawable.Callback {
    public void setIsDisabled(boolean isDisabled) {
        if (mIsDisabled != isDisabled) {
            mIsDisabled = isDisabled;
            if (mBadge instanceof FastBitmapDrawable fbd) {
                fbd.setIsDisabled(isDisabled);
            }
            updateFilter();
        }
    }
+7 −3
Original line number Diff line number Diff line
@@ -286,7 +286,9 @@ internal class TraceContextElement(

    init {
        if (usePerfettoSdk) {
            PerfettoTrace.end(PerfettoTraceConfig.COROUTINE_CATEGORY).addFlow(continuationId).emit()
            PerfettoTrace.end(PerfettoTraceConfig.COROUTINE_CATEGORY)
                .setFlow(continuationId.toLong())
                .emit()
        } else {
            Trace.traceEnd(Trace.TRACE_TAG_APP) // end: "TCE#init"
        }
@@ -321,7 +323,7 @@ internal class TraceContextElement(
                    PerfettoTraceConfig.COROUTINE_CATEGORY,
                    coroutineTraceName + if (continuationCount < 0) "" else continuationCount,
                )
                .addTerminatingFlow(continuationId)
                .setTerminatingFlow(continuationId.toLong())
                .emit()
            continuationId = nextRandomInt()
        } else {
@@ -371,7 +373,9 @@ internal class TraceContextElement(
        if (storage.data === oldState) return
        val contId = storage.restoreDataForSuspension(oldState)
        if (usePerfettoSdk) {
            PerfettoTrace.end(PerfettoTraceConfig.COROUTINE_CATEGORY).addFlow(contId).emit()
            PerfettoTrace.end(PerfettoTraceConfig.COROUTINE_CATEGORY)
                .setFlow(contId.toLong())
                .emit()
        } else {
            Trace.traceEnd(Trace.TRACE_TAG_APP) // end: coroutineTraceName
        }