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

Commit 20e6f6e5 authored by John Wu's avatar John Wu Committed by Automerger Merge Worker
Browse files

Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev am: 576b93c7 

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



Change-Id: I0fd0adbd798da445f3f1bd35c0250136d22bf306
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ec01c26 576b93c7

core/java/android/app/Activity.java

+3 −2
Original line number Diff line number Diff line
@@ -8045,8 +8045,9 @@ public class Activity extends ContextThemeWrapper 
                resultData.prepareToLeaveProcess(this);

            }

            upIntent.prepareToLeaveProcess(this);

            return ActivityClient.getInstance().navigateUpTo(mToken, upIntent, resultCode,

                    resultData);

            String resolvedType = upIntent.resolveTypeIfNeeded(getContentResolver());

            return ActivityClient.getInstance().navigateUpTo(mToken, upIntent, resolvedType,

                    resultCode, resultData);

        } else {

            return mParent.navigateUpToFromChild(this, upIntent);

        }

core/java/android/app/ActivityClient.java

+3 −3
Original line number Diff line number Diff line
@@ -141,11 +141,11 @@ public class ActivityClient { 
        }

    }



    boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode,

    boolean navigateUpTo(IBinder token, Intent destIntent, String resolvedType, int resultCode,

            Intent resultData) {

        try {

            return getActivityClientController().navigateUpTo(token, destIntent, resultCode,

                    resultData);

            return getActivityClientController().navigateUpTo(token, destIntent, resolvedType,

                    resultCode, resultData);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/app/IActivityClientController.aidl

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ interface IActivityClientController { 
            in SizeConfigurationBuckets sizeConfigurations);

    boolean moveActivityTaskToBack(in IBinder token, boolean nonRoot);

    boolean shouldUpRecreateTask(in IBinder token, in String destAffinity);

    boolean navigateUpTo(in IBinder token, in Intent target, int resultCode,

            in Intent resultData);

    boolean navigateUpTo(in IBinder token, in Intent target, in String resolvedType,

            int resultCode, in Intent resultData);

    boolean releaseActivityInstance(in IBinder token);

    boolean finishActivity(in IBinder token, int code, in Intent data, int finishTask);

    boolean finishActivityAffinity(in IBinder token);

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

+1 −10
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ class MediaCarouselController @Inject constructor( 
        val existingPlayer = MediaPlayerData.getMediaPlayer(key)

        val curVisibleMediaKey = MediaPlayerData.playerKeys()

                .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)

        val isCurVisibleMediaPlaying = MediaPlayerData.getMediaData(curVisibleMediaKey)?.isPlaying

        val isCurVisibleMediaPlaying = curVisibleMediaKey?.data?.isPlaying

        if (existingPlayer == null) {

            val newPlayer = mediaControlPanelFactory.get()

            newPlayer.attachPlayer(MediaViewHolder.create(
@@ -1042,15 +1042,6 @@ internal object MediaPlayerData { 
        }

    }



    fun getMediaData(mediaSortKey: MediaSortKey?): MediaData? {

        mediaData.forEach { (key, value) ->

            if (value == mediaSortKey) {

                return mediaData[key]?.data

            }

        }

        return null

    }



    fun getMediaPlayer(key: String): MediaControlPanel? {

        return mediaData.get(key)?.let { mediaPlayers.get(it) }

    }

services/core/java/com/android/server/wm/ActivityClientController.java

+3 −3
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ class ActivityClientController extends IActivityClientController.Stub { 
    }



    @Override

    public boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode,

            Intent resultData) {

    public boolean navigateUpTo(IBinder token, Intent destIntent, String resolvedType,

            int resultCode, Intent resultData) {

        final ActivityRecord r;

        synchronized (mGlobalLock) {

            r = ActivityRecord.isInRootTaskLocked(token);
@@ -348,7 +348,7 @@ class ActivityClientController extends IActivityClientController.Stub { 


        synchronized (mGlobalLock) {

            return r.getRootTask().navigateUpTo(

                    r, destIntent, destGrants, resultCode, resultData, resultGrants);

                    r, destIntent, resolvedType, destGrants, resultCode, resultData, resultGrants);

        }

    }