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

Commit d3ec03ee authored by Kshitij Gupta's avatar Kshitij Gupta Committed by Android (Google) Code Review
Browse files

Merge changes from topic "runBlockingTraced" into main 

* changes:
  RunBlockingDetector: Mark runBlocking as error
  SystemUI: Replace all usages of runBlocking with runBlockingTraced
parents ac79f533 533f5466

packages/SystemUI/checks/src/com/android/internal/systemui/lint/RunBlockingDetector.kt

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class RunBlockingDetector : Detector(), SourceCodeScanner { 
                    """,

                category = Category.PERFORMANCE,

                priority = 8,

                severity = Severity.WARNING,

                severity = Severity.ERROR,

                implementation =

                    Implementation(RunBlockingDetector::class.java, Scope.JAVA_FILE_SCOPE),

            )

packages/SystemUI/checks/tests/com/android/internal/systemui/lint/RunBlockingDetectorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ class RunBlockingDetectorTest : SystemUILintDetectorTest() { 
            .run()

            .expect(

                """

src/com/example/MyClass.kt:4: Warning: Importing kotlinx.coroutines.runBlocking is not allowed. [RunBlockingUsage]

src/com/example/MyClass.kt:4: Error: Importing kotlinx.coroutines.runBlocking is not allowed. [RunBlockingUsage]

                    import kotlinx.coroutines.runBlocking

                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 errors, 1 warnings

1 errors, 0 warnings

"""

                    .trimIndent()

            )

packages/SystemUI/src/com/android/systemui/communal/CommunalMetricsStartable.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.communal 


import android.app.StatsManager

import android.util.StatsEvent

import com.android.app.tracing.coroutines.runBlockingTraced as runBlocking

import com.android.systemui.CoreStartable

import com.android.systemui.communal.domain.interactor.CommunalInteractor

import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor
@@ -28,7 +29,6 @@ import com.android.systemui.shared.system.SysUiStatsLog 
import java.util.concurrent.Executor

import javax.inject.Inject

import kotlinx.coroutines.flow.first

import kotlinx.coroutines.runBlocking



@SysUISingleton

class CommunalMetricsStartable

packages/SystemUI/src/com/android/systemui/communal/data/backup/CommunalBackupUtils.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.communal.data.backup 


import android.content.Context

import androidx.annotation.WorkerThread

import com.android.app.tracing.coroutines.runBlockingTraced as runBlocking

import com.android.systemui.communal.data.db.CommunalDatabase

import com.android.systemui.communal.nano.CommunalHubState

import java.io.File
@@ -26,7 +27,6 @@ import java.io.FileNotFoundException 
import java.io.FileOutputStream

import java.io.IOException

import kotlinx.coroutines.flow.first

import kotlinx.coroutines.runBlocking



/** Utilities for communal backup and restore. */

class CommunalBackupUtils(private val context: Context) {

packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/domain/interactor/TutorialSchedulerInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.inputdevice.tutorial.domain.interactor



import android.os.SystemProperties

import com.android.app.tracing.coroutines.runBlockingTraced as runBlocking

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.inputdevice.tutorial.InputDeviceTutorialLogger
@@ -47,7 +48,6 @@ import kotlinx.coroutines.flow.flow 
import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.launch

import kotlinx.coroutines.runBlocking



/**

 * When the first time a keyboard or touchpad is connected, wait for [LAUNCH_DELAY], and as soon as