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

Commit 6bfbd142 authored by Stefan Andonian's avatar Stefan Andonian Committed by Android (Google) Code Review
Browse files

Merge "Refactor Traceur's TraceStart code to accept a TraceType." into main

parents 86451785 902b7875

packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingService.kt

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ constructor( 
        when (intent?.action) {

            ACTION_START -> {

                bgExecutor.execute {

                    traceurMessageSender.startTracing(issueRecordingState.traceType)

                    traceurMessageSender.startTracing(issueRecordingState.traceConfig)

                }

                issueRecordingState.isRecording = true

                if (!issueRecordingState.recordScreen) {

packages/SystemUI/src/com/android/systemui/recordissue/IssueRecordingState.kt

+9 −8
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import com.android.systemui.recordissue.RecordIssueModule.Companion.TILE_SPEC 
import com.android.systemui.res.R

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

import com.android.traceur.TraceUtils.PresetTraceType

import com.android.traceur.PresetTraceConfigs

import com.android.traceur.TraceConfig

import java.util.concurrent.CopyOnWriteArrayList

import javax.inject.Inject
@@ -53,8 +54,8 @@ constructor( 
        get() = prefs.getInt(KEY_ISSUE_TYPE_RES, ISSUE_TYPE_NOT_SET)

        set(value) = prefs.edit().putInt(KEY_ISSUE_TYPE_RES, value).apply()



    val traceType: PresetTraceType

        get() = ALL_ISSUE_TYPES[issueTypeRes] ?: PresetTraceType.UNSET

    val traceConfig: TraceConfig

        get() = ALL_ISSUE_TYPES[issueTypeRes] ?: PresetTraceConfigs.getDefaultConfig()



    private val listeners = CopyOnWriteArrayList<Runnable>()
@@ -83,12 +84,12 @@ constructor( 
        const val KEY_ISSUE_TYPE_RES = "key_issueTypeRes"

        const val ISSUE_TYPE_NOT_SET = -1



        val ALL_ISSUE_TYPES: Map<Int, PresetTraceType> =

        val ALL_ISSUE_TYPES: Map<Int, TraceConfig?> =

            hashMapOf(

                Pair(R.string.performance, PresetTraceType.PERFORMANCE),

                Pair(R.string.user_interface, PresetTraceType.UI),

                Pair(R.string.battery, PresetTraceType.BATTERY),

                Pair(R.string.thermal, PresetTraceType.THERMAL)

                Pair(R.string.performance, PresetTraceConfigs.getPerformanceConfig()),

                Pair(R.string.user_interface, PresetTraceConfigs.getUiConfig()),

                Pair(R.string.battery, PresetTraceConfigs.getBatteryConfig()),

                Pair(R.string.thermal, PresetTraceConfigs.getThermalConfig()),

            )

    }

}

packages/SystemUI/src/com/android/systemui/recordissue/TraceurMessageSender.kt

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.dagger.qualifiers.Background

import com.android.traceur.FileSender

import com.android.traceur.MessageConstants

import com.android.traceur.TraceUtils.PresetTraceType

import com.android.traceur.TraceConfig

import javax.inject.Inject



private const val TAG = "TraceurMessageSender"
@@ -93,9 +93,9 @@ class TraceurMessageSender @Inject constructor(@Background private val backgroun 
    }



    @WorkerThread

    fun startTracing(traceType: PresetTraceType) {

    fun startTracing(traceType: TraceConfig) {

        val data =

            Bundle().apply { putSerializable(MessageConstants.INTENT_EXTRA_TRACE_TYPE, traceType) }

            Bundle().apply { putParcelable(MessageConstants.INTENT_EXTRA_TRACE_TYPE, traceType) }

        notifyTraceur(MessageConstants.START_WHAT, data)

    }