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

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

Merge "Upload Perfetto Trace and Screen Recording as Unique Files when... 

Merge "Upload Perfetto Trace and Screen Recording as Unique Files when recording an issue." into main
parents d03906d5 dd80507c

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

+21 −18
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import java.util.concurrent.Executor 
import java.util.zip.ZipEntry

import java.util.zip.ZipEntry

import java.util.zip.ZipOutputStream

import java.util.zip.ZipOutputStream

import javax.inject.Inject

import javax.inject.Inject

import kotlin.jvm.optionals.getOrElse





class IssueRecordingService

class IssueRecordingService

@Inject

@Inject
@@ -140,15 +141,25 @@ constructor( 
    }

    }





    private fun shareRecording(screenRecording: Uri?) {

    private fun shareRecording(screenRecording: Uri?) {

        val sharableUri: Uri =

        val traces =

            zipAndPackageRecordings(

            TraceUtils.traceDump(contentResolver, TRACE_FILE_NAME).getOrElse {

                TraceUtils.traceDump(contentResolver, TRACE_FILE_NAME).get(),

                Log.v(

                screenRecording

                    TAG,

                    "Traces were not present. This can happen if users double" +

                        "click on share notification. Traces are cleaned up after sharing" +

                        "so they won't be present for the 2nd share attempt."

                )

                )

                ?: return

                return

            }

        val perfetto = FileProvider.getUriForFile(this, AUTHORITY, traces.first())

        val urisToShare = mutableListOf(perfetto)

        traces.removeFirst()



        getZipWinscopeFileUri(traces)?.let { urisToShare.add(it) }

        screenRecording?.let { urisToShare.add(it) }



        val sendIntent =

        val sendIntent =

            FileSender.buildSendIntent(this, listOf(sharableUri))

            FileSender.buildSendIntent(this, urisToShare).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)





        // TODO: Debug why the notification shade isn't closing upon starting the BetterBug activity

        // TODO: Debug why the notification shade isn't closing upon starting the BetterBug activity

        mKeyguardDismissUtil.executeWhenUnlocked(

        mKeyguardDismissUtil.executeWhenUnlocked(
@@ -161,7 +172,7 @@ constructor( 
        )

        )

    }

    }





    private fun zipAndPackageRecordings(traceFiles: List<File>, screenRecording: Uri?): Uri? {

    private fun getZipWinscopeFileUri(traceFiles: List<File>): Uri? {

        try {

        try {

            externalCacheDir?.mkdirs()

            externalCacheDir?.mkdirs()

            val outZip: File = File.createTempFile(TEMP_FILE_PREFIX, ZIP_SUFFIX, externalCacheDir)

            val outZip: File = File.createTempFile(TEMP_FILE_PREFIX, ZIP_SUFFIX, externalCacheDir)
@@ -171,13 +182,6 @@ constructor( 
                    Files.copy(file.toPath(), os)

                    Files.copy(file.toPath(), os)

                    os.closeEntry()

                    os.closeEntry()

                }

                }

                if (screenRecording != null) {

                    contentResolver.openInputStream(screenRecording)?.use {

                        os.putNextEntry(ZipEntry(SCREEN_RECORDING_ZIP_LABEL))

                        it.transferTo(os)

                        os.closeEntry()

                    }

                }

            }

            }

            return FileProvider.getUriForFile(this, AUTHORITY, outZip)

            return FileProvider.getUriForFile(this, AUTHORITY, outZip)

        } catch (e: Exception) {

        } catch (e: Exception) {
@@ -192,8 +196,7 @@ constructor( 
        private const val EXTRA_SCREEN_RECORD = "extra_screenRecord"

        private const val EXTRA_SCREEN_RECORD = "extra_screenRecord"

        private const val EXTRA_WINSCOPE_TRACING = "extra_winscopeTracing"

        private const val EXTRA_WINSCOPE_TRACING = "extra_winscopeTracing"

        private const val ZIP_SUFFIX = ".zip"

        private const val ZIP_SUFFIX = ".zip"

        private const val TEMP_FILE_PREFIX = "issue_recording"

        private const val TEMP_FILE_PREFIX = "winscope_recordings"

        private const val SCREEN_RECORDING_ZIP_LABEL = "screen-recording.mp4"





        private val DEFAULT_TRACE_TAGS = listOf<String>()

        private val DEFAULT_TRACE_TAGS = listOf<String>()

        private const val DEFAULT_BUFFER_SIZE = 16384

        private const val DEFAULT_BUFFER_SIZE = 16384