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

Commit a058df55 authored Jul 10, 2023 by Peter Kalauskas Committed by Automerger Merge Worker Jul 10, 2023

Merge "Change order of arguments to traceAsync" into udc-qpr-dev am: ff651d3a am: 85816120

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

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

parents 56fd7dc1 85816120

packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ class TraceUtils {
		* under a single track.
		*/
		inline fun <T> traceAsync(method: String, block: () -> T): T =
		traceAsync(method, "AsyncTraces", block)
		traceAsync("AsyncTraces", method, block)

		/**
		* Creates an async slice in a track with [trackName] while [block] runs.
		@@ -76,7 +76,7 @@ class TraceUtils {
		* [trackName] of the track. The track is one of the rows visible in a perfetto trace inside
		* SystemUI process.
		*/
		inline fun <T> traceAsync(method: String, trackName: String, block: () -> T): T {
		inline fun <T> traceAsync(trackName: String, method: String, block: () -> T): T {
		val cookie = lastCookie.incrementAndGet()
		Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_APP, trackName, method, cookie)
		try {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -414,7 +414,7 @@ constructor(
		}

		private suspend fun isFeatureDisabledByDevicePolicy(): Boolean =
		traceAsync("isFeatureDisabledByDevicePolicy", TAG) {
		traceAsync(TAG, "isFeatureDisabledByDevicePolicy") {
		withContext(backgroundDispatcher) {
		devicePolicyManager.areKeyguardShortcutsDisabled(userId = userTracker.userId)
		}