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

Commit 8ea3583b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Correcting the package name used on splash screen window." into sc-dev am: 0793f65c 

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

Change-Id: I28623c6b9596275536a1e3f979cd9650f8082b3e
parents c4569c5c 0793f65c

core/java/android/window/StartingWindowInfo.java

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.annotation.TestApi;

import android.app.ActivityManager;

import android.app.TaskInfo;

import android.content.pm.ActivityInfo;

import android.os.Parcel;

import android.os.Parcelable;

import android.view.InsetsState;
@@ -77,6 +78,14 @@ public final class StartingWindowInfo implements Parcelable { 
    @NonNull

    public ActivityManager.RunningTaskInfo taskInfo;



    /**

     * The {@link ActivityInfo} of the target activity which to create the starting window.

     * It can be null if the info is the same as the top in task info.

     * @hide

     */

    @Nullable

    public ActivityInfo targetActivityInfo;



    /**

     * InsetsState of TopFullscreenOpaqueWindow

     * @hide
@@ -174,6 +183,7 @@ public final class StartingWindowInfo implements Parcelable { 
    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeTypedObject(taskInfo, flags);

        dest.writeTypedObject(targetActivityInfo, flags);

        dest.writeInt(startingWindowTypeParameter);

        dest.writeTypedObject(topOpaqueWindowInsetsState, flags);

        dest.writeTypedObject(topOpaqueWindowLayoutParams, flags);
@@ -185,6 +195,7 @@ public final class StartingWindowInfo implements Parcelable { 


    void readFromParcel(@NonNull Parcel source) {

        taskInfo = source.readTypedObject(ActivityManager.RunningTaskInfo.CREATOR);

        targetActivityInfo = source.readTypedObject(ActivityInfo.CREATOR);

        startingWindowTypeParameter = source.readInt();

        topOpaqueWindowInsetsState = source.readTypedObject(InsetsState.CREATOR);

        topOpaqueWindowLayoutParams = source.readTypedObject(
@@ -198,6 +209,7 @@ public final class StartingWindowInfo implements Parcelable { 
    @Override

    public String toString() {

        return "StartingWindowInfo{taskId=" + taskInfo.taskId

                + " targetActivityInfo=" + targetActivityInfo

                + " displayId=" + taskInfo.displayId

                + " topActivityType=" + taskInfo.topActivityType

                + " preferredStartingWindowType="

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java

+4 −6
Original line number Diff line number Diff line
@@ -168,16 +168,14 @@ public class StartingSurfaceDrawer { 
    void addSplashScreenStartingWindow(StartingWindowInfo windowInfo, IBinder appToken,

            @StartingWindowType int suggestType) {

        final RunningTaskInfo taskInfo = windowInfo.taskInfo;

        final ActivityInfo activityInfo = taskInfo.topActivityInfo;

        if (activityInfo == null) {

        final ActivityInfo activityInfo = windowInfo.targetActivityInfo != null

                ? windowInfo.targetActivityInfo

                : taskInfo.topActivityInfo;

        if (activityInfo == null || activityInfo.packageName == null) {

            return;

        }



        final int displayId = taskInfo.displayId;

        if (activityInfo.packageName == null) {

            return;

        }



        final int taskId = taskInfo.taskId;

        Context context = mContext;

        // replace with the default theme if the application didn't set

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ public class StartingSurfaceDrawerTests { 
        final ActivityManager.RunningTaskInfo taskInfo = new ActivityManager.RunningTaskInfo();

        taskInfo.topActivityInfo = info;

        taskInfo.taskId = taskId;

        windowInfo.targetActivityInfo = info;

        windowInfo.taskInfo = taskInfo;

        return windowInfo;

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -3514,7 +3514,9 @@ class Task extends TaskFragment { 
    StartingWindowInfo getStartingWindowInfo(ActivityRecord activity) {

        final StartingWindowInfo info = new StartingWindowInfo();

        info.taskInfo = getTaskInfo();



        info.targetActivityInfo = info.taskInfo.topActivityInfo != null

                && activity.info != info.taskInfo.topActivityInfo

                ? activity.info : null;

        info.isKeyguardOccluded =

            mAtmService.mKeyguardController.isDisplayOccluded(DEFAULT_DISPLAY);