Skip to content

Commit 5dd78bf

Browse files
tcmulcahytcmulcahy
committed
Fix deprecation warnings
1 parent e0e00fc commit 5dd78bf

File tree

10 files changed

+40
-41
lines changed

10 files changed

+40
-41
lines changed

‎papa-dev/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ dependencies {
4040
compileOnly(Dependencies.Build.AndroidXAnnotation)
4141

4242
implementation(project(":papa"))
43+
implementation(Dependencies.AndroidXTracing)
4344
}

‎papa-dev/src/main/java/papa/internal/ForceShellProfileableReceiver.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package papa.internal
33
import android.content.BroadcastReceiver
44
import android.content.Context
55
import android.content.Intent
6-
import papa.SafeTrace
6+
import androidx.tracing.Trace
7+
import papa.SafeTraceSetup
78

89
internal class ForceShellProfileableReceiver : BroadcastReceiver() {
910
override fun onReceive(context: Context, intent: Intent) {
10-
SafeTrace.forceShellProfileable()
11+
Trace.forceEnableAppTracing()
12+
SafeTraceSetup.enableMainThreadMessageTracing()
1113
}
1214
}

‎papa-dev/src/main/java/papa/internal/GcTriggerReceiver.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import android.content.BroadcastReceiver
44
import android.content.Context
55
import android.content.Intent
66
import android.util.Log
7-
import papa.safeTrace
7+
import androidx.tracing.trace
88

99
internal class GcTriggerReceiver : BroadcastReceiver() {
1010
override fun onReceive(
1111
context: Context,
1212
intent: Intent
1313
) {
14-
safeTrace("force gc") {
14+
trace("force gc") {
1515
Log.d("GcTriggerReceiver", "Triggering GC")
1616
gc()
1717
context.sendBroadcast(Intent("papa.GC_TRIGGERED"))

‎papa/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ dependencies {
5050

5151
implementation(Dependencies.Curtains)
5252
implementation(Dependencies.AndroidXCore)
53+
implementation(Dependencies.AndroidXTracing)
5354

5455
testImplementation(Dependencies.JUnit)
5556
testImplementation(Dependencies.Mockito)

‎papa/src/main/java/papa/InteractionRuleClient.kt‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package papa
22

3+
import androidx.tracing.Trace
34
import papa.InteractionUpdated.CanceledOnEvent
45
import papa.InteractionUpdated.CanceledOnRuleRemoved
56
import papa.InteractionUpdated.CanceledOnTimeout
@@ -119,18 +120,16 @@ private class InteractionEngine<ParentEventType : Any>(
119120
* called with an unknown [Runnable].
120121
*/
121122
private val cancelOnTimeout: Runnable = Runnable {
122-
SafeTrace.logSection {
123-
"PAPA-cancel:timeout"
124-
}
123+
Trace.beginSection("PAPA-cancel:timeout")
124+
Trace.endSection()
125125
stopRunning()
126126
trace.endTrace()
127127
updateListener.onInteractionUpdate(CanceledOnTimeout(cancelTimeout, this))
128128
}
129129

130130
fun cancelOnRuleRemoved() {
131-
SafeTrace.logSection {
132-
"PAPA-cancel:ruleRemoved"
133-
}
131+
Trace.beginSection("PAPA-cancel:ruleRemoved")
132+
Trace.endSection()
134133
stopRunning()
135134
trace.endTrace()
136135
updateListener.onInteractionUpdate(CanceledOnRuleRemoved(this))
@@ -153,19 +152,17 @@ private class InteractionEngine<ParentEventType : Any>(
153152

154153
override fun cancel(reason: String) {
155154
val sentEvent = eventInScope!!
156-
SafeTrace.logSection {
157-
"PAPA-cancel:${sentEvent.event}:$reason"
158-
}
155+
Trace.beginSection("PAPA-cancel:${sentEvent.event}:$reason")
156+
Trace.endSection()
159157
stopRunning()
160158
trace.endTrace()
161159
updateListener.onInteractionUpdate(CanceledOnEvent(sentEvent, this, reason))
162160
}
163161

164162
override fun finish(): FinishingInteraction<ParentEventType> {
165163
val sentEvent = eventInScope!!
166-
SafeTrace.logSection {
167-
"PAPA-finishInteraction:${sentEvent.event}"
168-
}
164+
Trace.beginSection("PAPA-finishInteraction:${sentEvent.event}")
165+
Trace.endSection()
169166
stopRunning()
170167
finishingInteractions += this
171168
addRecordedEvent()
@@ -188,9 +185,8 @@ private class InteractionEngine<ParentEventType : Any>(
188185

189186
override fun recordEvent() {
190187
val sentEvent = eventInScope!!
191-
SafeTrace.logSection {
192-
"PAPA-recordEvent:${sentEvent.event}"
193-
}
188+
Trace.beginSection("PAPA-recordEvent:${sentEvent.event}")
189+
Trace.endSection()
194190
addRecordedEvent()
195191
updateListener.onInteractionUpdate(EventRecorded(sentEvent, this))
196192
}
@@ -230,9 +226,8 @@ private class InteractionEngine<ParentEventType : Any>(
230226
trace: InteractionTrace,
231227
cancelTimeout: Duration
232228
): RunningInteraction<ParentEventType> {
233-
SafeTrace.logSection {
234-
"PAPA-startInteraction:${sentEvent.event}"
235-
}
229+
Trace.beginSection("PAPA-startInteraction:${sentEvent.event}")
230+
Trace.endSection()
236231
val runningInteraction = RealRunningInteraction(
237232
interactionTrigger = trigger,
238233
trace = trace,

‎papa/src/main/java/papa/InteractionTrace.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package papa
22

3+
import androidx.tracing.Trace
4+
35
fun interface InteractionTrace {
46
fun endTrace()
57

@@ -8,9 +10,9 @@ fun interface InteractionTrace {
810
name: String
911
): InteractionTrace {
1012
val cookie = System.nanoTime().rem(Int.MAX_VALUE).toInt()
11-
SafeTrace.beginAsyncSection(name, cookie)
13+
Trace.beginAsyncSection(name, cookie)
1214
return InteractionTrace {
13-
SafeTrace.endAsyncSection(name, cookie)
15+
Trace.endAsyncSection(name, cookie)
1416
}
1517
}
1618
}

‎papa/src/main/java/papa/internal/ApplicationHolder.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package papa.internal
22

33
import android.app.Application
4+
import androidx.tracing.Trace
45
import com.squareup.papa.R
56
import papa.MainThreadMessageSpy
6-
import papa.SafeTrace
77
import papa.SafeTraceSetup
88

99
/**
@@ -21,7 +21,7 @@ internal object ApplicationHolder {
2121
this.application = application
2222
SafeTraceSetup.init(application)
2323
if (isForegroundImportance) {
24-
SafeTrace.beginAsyncSection(Perfs.LAUNCH_TRACE_NAME)
24+
Trace.beginAsyncSection(Perfs.LAUNCH_TRACE_NAME, 0)
2525
}
2626
val resources = application.resources
2727
if (resources.getBoolean(R.bool.papa_track_input_events)) {

‎papa/src/main/java/papa/internal/InputTracker.kt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import android.view.MotionEvent
88
import android.view.ViewConfiguration
99
import android.view.ViewGroup
1010
import android.widget.AbsListView
11+
import androidx.tracing.Trace
12+
import androidx.tracing.trace
1113
import curtains.Curtains
1214
import curtains.KeyEventInterceptor
1315
import curtains.OnRootViewAddedListener
@@ -19,9 +21,7 @@ import curtains.windowAttachCount
1921
import papa.InputEventTrigger
2022
import papa.InteractionTriggerWithPayload
2123
import papa.MainThreadTriggerStack
22-
import papa.SafeTrace
2324
import papa.internal.FrozenFrameOnTouchDetector.findPressedView
24-
import papa.safeTrace
2525
import kotlin.time.Duration.Companion.milliseconds
2626
import kotlin.time.Duration.Companion.nanoseconds
2727

@@ -46,7 +46,7 @@ internal object InputTracker {
4646
// the code that captured the event at time N.
4747
val actionUpTrigger = if (isActionUp) {
4848
val cookie = deliveryUptimeNanos.rem(Int.MAX_VALUE).toInt()
49-
SafeTrace.beginAsyncSection(TAP_INTERACTION_SECTION, cookie)
49+
Trace.beginAsyncSection(TAP_INTERACTION_SECTION, cookie)
5050
val eventUptime = motionEvent.eventTime.milliseconds
5151
// Event bugfix: if event time is after delivery time, use delivery time as trigger time.
5252
val triggerUptime = if (eventUptime > deliveryUptime) deliveryUptime else eventUptime
@@ -55,7 +55,7 @@ internal object InputTracker {
5555
triggerUptime = triggerUptime,
5656
name = "tap",
5757
interactionTrace = {
58-
SafeTrace.endAsyncSection(TAP_INTERACTION_SECTION, cookie)
58+
Trace.endAsyncSection(TAP_INTERACTION_SECTION, cookie)
5959
},
6060
payload = InputEventTrigger.createTrackingWhenFrameRendered(
6161
inputEventWindow = window,
@@ -76,9 +76,7 @@ internal object InputTracker {
7676
handler.post(setEventForPostedClick)
7777
}
7878

79-
val dispatchState = safeTrace(
80-
{ MotionEvent.actionToString(motionEvent.action) }
81-
) {
79+
val dispatchState = trace(MotionEvent.actionToString(motionEvent.action)) {
8280
if (actionUpTrigger != null) {
8381
// In case the action up is immediately triggering a click (e.g. Compose)
8482
MainThreadTriggerStack.triggeredBy(
@@ -102,7 +100,7 @@ internal object InputTracker {
102100
}
103101

104102
val dispatchEnd = SystemClock.uptimeMillis()
105-
val viewPressedAfterDispatch = safeTrace("findPressedView()") {
103+
val viewPressedAfterDispatch = trace("findPressedView()") {
106104
(window.decorView as? ViewGroup)?.findPressedView()
107105
}
108106
// AbsListView subclasses post clicks with a delay.
@@ -128,7 +126,7 @@ internal object InputTracker {
128126
val deliveryUptimeNanos = System.nanoTime()
129127
val traceSectionName = keyEvent.traceSectionName
130128
val cookie = deliveryUptimeNanos.rem(Int.MAX_VALUE).toInt()
131-
SafeTrace.beginAsyncSection(traceSectionName, cookie)
129+
Trace.beginAsyncSection(traceSectionName, cookie)
132130
val deliveryUptime = deliveryUptimeNanos.nanoseconds
133131
val eventUptime = keyEvent.eventTime.milliseconds
134132

@@ -139,7 +137,7 @@ internal object InputTracker {
139137
triggerUptime = triggerUptime,
140138
name = "key ${keyEvent.name}",
141139
interactionTrace = {
142-
SafeTrace.endAsyncSection(traceSectionName, cookie)
140+
Trace.endAsyncSection(traceSectionName, cookie)
143141
},
144142
payload = InputEventTrigger.createTrackingWhenFrameRendered(
145143
inputEventWindow = window,

‎papa/src/main/java/papa/internal/LaunchTracker.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package papa.internal
22

33
import android.app.Activity
44
import android.os.SystemClock
5+
import androidx.tracing.Trace
56
import papa.Choreographers
67
import papa.Handlers
78
import papa.OnFrameRenderedListener
8-
import papa.SafeTrace
99
import kotlin.time.Duration
1010

1111
internal class LaunchTracker(
@@ -58,7 +58,7 @@ internal class LaunchTracker(
5858
launchInProgress?.let { launch ->
5959
if (launch.isStale) {
6060
if (Perfs.isTracingLaunch) {
61-
SafeTrace.endAsyncSection(Perfs.LAUNCH_TRACE_NAME)
61+
Trace.endAsyncSection(Perfs.LAUNCH_TRACE_NAME, 0)
6262
Perfs.isTracingLaunch = false
6363
}
6464
launchInProgress = null
@@ -76,7 +76,7 @@ internal class LaunchTracker(
7676
if (launchInProgress == null) {
7777
// Check to handle the cold start case where we're already tracing a launch.
7878
if (!Perfs.isTracingLaunch) {
79-
SafeTrace.beginAsyncSection(Perfs.LAUNCH_TRACE_NAME)
79+
Trace.beginAsyncSection(Perfs.LAUNCH_TRACE_NAME, 0)
8080
Perfs.isTracingLaunch = true
8181
}
8282

‎papa/src/main/java/papa/internal/Perfs.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import papa.PreLaunchState.NO_PROCESS_FIRST_LAUNCH_AFTER_CLEAR_DATA
3838
import papa.PreLaunchState.NO_PROCESS_FIRST_LAUNCH_AFTER_INSTALL
3939
import papa.PreLaunchState.NO_PROCESS_FIRST_LAUNCH_AFTER_UPGRADE
4040
import papa.PreLaunchState.PROCESS_WAS_LAUNCHING_IN_BACKGROUND
41-
import papa.SafeTrace
41+
import androidx.tracing.Trace
4242
import papa.internal.AppUpdateDetector.Companion.trackAppUpgrade
4343
import papa.internal.LaunchTracker.Launch
4444
import papa.internal.LaunchedActivityStartingTransition.CREATED_NO_STATE
@@ -270,7 +270,7 @@ internal object Perfs {
270270
initCalledRealtimeMillis
271271
)
272272
if (isTracingLaunch) {
273-
SafeTrace.endAsyncSection(LAUNCH_TRACE_NAME)
273+
Trace.endAsyncSection(LAUNCH_TRACE_NAME, 0)
274274
isTracingLaunch = false
275275
}
276276
PapaEventListener.sendEvent(

0 commit comments

Comments
 (0)