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

Commit 64ec485d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6955225 from 36fc7e46 to rvc-qpr2-release 

Change-Id: Ifcf147ec259bf03e1695683f7da631e56d7a9fa3
parents c100df4b 36fc7e46

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+2 −1
Original line number Diff line number Diff line
@@ -609,7 +609,8 @@ class MediaDataManager( 
            // Move to resume key (aka package name) if that key doesn't already exist.

            val resumeAction = getResumeMediaAction(removed.resumeAction!!)

            val updated = removed.copy(token = null, actions = listOf(resumeAction),

                    actionsToShowInCompact = listOf(0), active = false, resumption = true)

                    actionsToShowInCompact = listOf(0), active = false, resumption = true,

                    isClearable = true)

            val pkg = removed?.packageName

            val migrate = mediaEntries.put(pkg, updated) == null

            // Notify listeners of "new" controls when migrating or removed and update when not

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −0
Original line number Diff line number Diff line
@@ -1466,10 +1466,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;

        if (mHasFeatureLeanback) {

            isSetupComplete &= isTvUserSetupComplete();

        } else if (mHasFeatureAuto) {

            isSetupComplete &= isAutoUserSetupComplete();

        }

        return isSetupComplete;

    }



    private boolean isAutoUserSetupComplete() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

                "android.car.SETUP_WIZARD_IN_PROGRESS", 0, UserHandle.USER_CURRENT) == 0;

    }



    private boolean isTvUserSetupComplete() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;