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

Commit dab79892 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33316225',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33316225', 'googleplex-android-review.googlesource.com/33327509'] into 25Q2-release.

Change-Id: Icd03a150140d8957e96d22ec46d8eec7badb7332
parents cca74a40 432471d0

packages/EasterEgg/src/com/android/egg/landroid/UniverseProgressNotifier.kt

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ fun lerpRange(range: ClosedFloatingPointRange<Float>, x: Float): Float = 
class UniverseProgressNotifier(val context: Context, val universe: Universe) {

    private val notificationId = universe.randomSeed.toInt()

    private val chan =

        NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT)

        NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW)

            .apply { lockscreenVisibility = Notification.VISIBILITY_PUBLIC }

    private val noman =

        context.getSystemService(NotificationManager::class.java)?.apply {
@@ -83,7 +83,7 @@ class UniverseProgressNotifier(val context: Context, val universe: Universe) { 
                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,

                )

            )

            .setPriority(Notification.PRIORITY_DEFAULT)

            .setFlag(Notification.FLAG_ONLY_ALERT_ONCE, true)

            .setColorized(true)

            .setOngoing(true)

            .setColor(Colors.Eigengrau2.toArgb())

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -13272,11 +13272,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        Set<String> suspendedPackagesBefore = mDevicePolicyEngine.getResolvedPolicy(

                PolicyDefinition.PACKAGES_SUSPENDED, caller.getUserId());













        Set<String> currentPackages = mDevicePolicyEngine.getLocalPolicySetByAdmin(













        Set<String> currentPackages = new ArraySet<>(mDevicePolicyEngine.getLocalPolicySetByAdmin(















                PolicyDefinition.PACKAGES_SUSPENDED,















                enforcingAdmin,













                caller.getUserId());













        if (currentPackages == null) currentPackages = new ArraySet<>();













                caller.getUserId()));















        if (suspended) {















            currentPackages.addAll(packages);















        } else {