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

Commit 9b05c039 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b/294110802-aosp-main-future" into aosp-main-future 

* changes:
  Fix kotlin nullable errors in Input tests
  Fix kotlin nullable errors in SettingsLib
  Fix kotlin nullable errors in EasterEgg
  Fix kotlin nullable errors in PackageInstallerSessions
  Fix kotlin nullable errors in perftests
  Fix kotlin nullable errors in services.permission
  Fix kotlin nullable errors in SilkFX tests
parents 035c5308 e404308c

apct-tests/perftests/core/src/android/input/MotionPredictorBenchmark.kt

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ class MotionPredictorBenchmark { 
                eventTime, ACTION_MOVE, /*x=*/eventPosition, /*y=*/eventPosition)

            predictor.record(moveEvent)

            val predictionTime = eventTime + eventInterval

            val predicted = predictor.predict(predictionTime.toNanos())

            val predicted = checkNotNull(predictor.predict(predictionTime.toNanos()))

            assertTrue(predicted.eventTime <= (predictionTime + offset).toMillis())

        }

    }

core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt

+4 −2
Original line number Diff line number Diff line
@@ -445,7 +445,9 @@ class PackageSessionTests { 
                    Manifest.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION)

        }

        handlerThread = HandlerThread("PackageSessionTests")

        handlerThread?.start()

        handler = Handler(handlerThread?.looper)

        handlerThread?.let {

            it.start()

            handler = Handler(it.looper)

        }

    }

}

packages/EasterEgg/src/com/android/egg/quares/QuaresActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ class ClueView(context: Context) : View(context) { 
        return correct

    }



    override fun onDraw(canvas: Canvas?) {

    override fun onDraw(canvas: Canvas) {

        super.onDraw(canvas)

        if (!showText) return

        canvas?.let {

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppListRepository.kt

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ internal class AppListRepositoryImpl(private val context: Context) : AppListRepo 
            packageManager.getInstalledModules(0)

                .filter { it.isHidden }

                .map { it.packageName }

                .filterNotNull()

                .toSet()

        }

        val hideWhenDisabledPackagesDeferred = async {

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/PackageManagers.kt

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ internal class PackageManagersImpl( 
        val packageInfo = getPackageInfoAsUser(packageName, PackageManager.GET_PERMISSIONS, userId)

        val index = packageInfo?.requestedPermissions?.indexOf(permission) ?: return false

        return index >= 0 &&

            packageInfo.requestedPermissionsFlags[index].hasFlag(REQUESTED_PERMISSION_GRANTED)

            checkNotNull(packageInfo.requestedPermissionsFlags)[index]

                .hasFlag(REQUESTED_PERMISSION_GRANTED)

    }



    override suspend fun getAppOpPermissionPackages(userId: Int, permission: String): Set<String> =