diff options
| author | 2023-07-10 23:03:14 +0000 | |
|---|---|---|
| committer | 2023-07-10 23:03:14 +0000 | |
| commit | a058df55dc69a6e60607eaae5f3fc6918bd33a12 (patch) | |
| tree | 1f2852088fc44dcfa3cbb6b6ff8664d2fa98b3e2 | |
| parent | 56fd7dc178ad60adeb2b85d0416a442ed08091d6 (diff) | |
| parent | 85816120bbbe2cc0e5c5e75e52b472fe237bb14a (diff) | |
Merge "Change order of arguments to traceAsync" into udc-qpr-dev am: ff651d3a02 am: 85816120bb
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>
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt b/packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt index e02e592c32cc..96a974d5dd80 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/util/TraceUtils.kt @@ -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 { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index 320b2a4e4561..324d443d974d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -414,7 +414,7 @@ constructor( } private suspend fun isFeatureDisabledByDevicePolicy(): Boolean = - traceAsync("isFeatureDisabledByDevicePolicy", TAG) { + traceAsync(TAG, "isFeatureDisabledByDevicePolicy") { withContext(backgroundDispatcher) { devicePolicyManager.areKeyguardShortcutsDisabled(userId = userTracker.userId) } |