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

Commit 54086d73 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes I31c4f4d2,I35530e7e,Ib541e676,I2b8de9c8,I759f7022, ... into... 

Merge changes I31c4f4d2,I35530e7e,Ib541e676,I2b8de9c8,I759f7022, ... into udc-dev-plus-aosp am: f91acd2d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24517142



Change-Id: Ia59bf3012960b0be83d8dc5cfbf35ea5b629314f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e57b90e8 f91acd2d

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> =