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

Commit 88f53c23 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge changes Ie79a67d3,Ifb548a30 

* changes:
  Adds displayId to android.app.TaskInfo
  Fixes missing FLAG_ACTIVIY_NEW_TASK in startActivity
parents 29bdd5d1 b1abb555

core/java/android/app/TaskInfo.java

+9 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ public class TaskInfo { 
    @UnsupportedAppUsage

    public long lastActiveTime;



    /**

     * The id of the display this task is associated with.

     * @hide

     */

    public int displayId;



    /**

     * The recent activity values for the highest activity in the stack to have set the values.

     * {@link Activity#setTaskDescription(android.app.ActivityManager.TaskDescription)}.
@@ -152,6 +158,7 @@ public class TaskInfo { 
        userId = source.readInt();

        stackId = source.readInt();

        taskId = source.readInt();

        displayId = source.readInt();

        isRunning = source.readBoolean();

        baseIntent = source.readInt() != 0

                ? Intent.CREATOR.createFromParcel(source)
@@ -179,6 +186,7 @@ public class TaskInfo { 
        dest.writeInt(userId);

        dest.writeInt(stackId);

        dest.writeInt(taskId);

        dest.writeInt(displayId);

        dest.writeBoolean(isRunning);



        if (baseIntent != null) {
@@ -209,6 +217,7 @@ public class TaskInfo { 
    @Override

    public String toString() {

        return "TaskInfo{userId=" + userId + " stackId=" + stackId + " taskId=" + taskId

                + " displayId=" + displayId

                + " isRunning=" + isRunning

                + " baseIntent=" + baseIntent + " baseActivity=" + baseActivity

                + " topActivity=" + topActivity + " origActivity=" + origActivity

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

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ import android.util.DisplayMetrics; 
import android.util.EventLog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.Display;

import android.view.DisplayInfo;



import com.android.internal.annotations.VisibleForTesting;
@@ -2332,6 +2333,7 @@ class TaskRecord extends ConfigurationContainer { 
        info.userId = userId;

        info.stackId = getStackId();

        info.taskId = taskId;

        info.displayId = mStack == null ? Display.INVALID_DISPLAY : mStack.mDisplayId;

        info.isRunning = getTopActivity() != null;

        info.baseIntent = new Intent(getBaseIntent());

        info.baseActivity = reuseActivitiesReport.base != null

services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java

+10 −2
Original line number Diff line number Diff line
@@ -35,9 +35,11 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.support.test.uiautomator.UiDevice;

import android.text.TextUtils;



import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;



import com.android.internal.annotations.GuardedBy;
@@ -76,6 +78,7 @@ public class TaskStackChangedListenerTest { 
    }



    @Test

    @Presubmit

    public void testTaskStackChanged_afterFinish() throws Exception {

        registerTaskStackChangedListener(new TaskStackListener() {

            @Override
@@ -87,7 +90,8 @@ public class TaskStackChangedListenerTest { 
        });



        Context context = getInstrumentation().getContext();

        context.startActivity(new Intent(context, ActivityA.class));

        context.startActivity(

                new Intent(context, ActivityA.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

        UiDevice.getInstance(getInstrumentation()).waitForIdle();

        synchronized (sLock) {

            assertTrue(sTaskStackChangedCalled);
@@ -96,6 +100,7 @@ public class TaskStackChangedListenerTest { 
    }



    @Test

    @FlakyTest(bugId = 119893767)

    public void testTaskDescriptionChanged() throws Exception {

        final Object[] params = new Object[2];

        final CountDownLatch latch = new CountDownLatch(1);
@@ -124,6 +129,7 @@ public class TaskStackChangedListenerTest { 
    }



    @Test

    @FlakyTest(bugId = 119893767)

    public void testActivityRequestedOrientationChanged() throws Exception {

        final int[] params = new int[2];

        final CountDownLatch latch = new CountDownLatch(1);
@@ -146,6 +152,7 @@ public class TaskStackChangedListenerTest { 
     * Tests for onTaskCreated, onTaskMovedToFront, onTaskRemoved and onTaskRemovalStarted.

     */

    @Test

    @FlakyTest(bugId = 119893767)

    public void testTaskChangeCallBacks() throws Exception {

        final Object[] params = new Object[2];

        final CountDownLatch taskCreatedLaunchLatch = new CountDownLatch(1);
@@ -221,7 +228,8 @@ public class TaskStackChangedListenerTest { 
        final ActivityMonitor monitor = new ActivityMonitor(activityClass.getName(), null, false);

        getInstrumentation().addMonitor(monitor);

        final Context context = getInstrumentation().getContext();

        context.startActivity(new Intent(context, activityClass));

        context.startActivity(

                new Intent(context, activityClass).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

        final TestActivity activity = (TestActivity) monitor.waitForActivityWithTimeout(1000);

        if (activity == null) {

            throw new RuntimeException("Timed out waiting for Activity");