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

Commit 9d9dcadf authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev 

am: a16cc421

Change-Id: Ib05d3f19b1c01f3df5d833153494b861c4cfeac1
parents fecb2620 a16cc421

services/core/java/com/android/server/am/AppErrors.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -476,7 +476,8 @@ class AppErrors { 
                    } catch (IllegalArgumentException e) {

                    } catch (IllegalArgumentException e) {

                        // Hmm, that didn't work, app might have crashed before creating a

                        // Hmm, that didn't work, app might have crashed before creating a

                        // recents entry. Let's see if we have a safe-to-restart intent.

                        // recents entry. Let's see if we have a safe-to-restart intent.

                        final Set<String> cats = task.intent.getCategories();

                        final Set<String> cats = task.intent != null

                                ? task.intent.getCategories() : null;

                        if (cats != null && cats.contains(Intent.CATEGORY_LAUNCHER)) {

                        if (cats != null && cats.contains(Intent.CATEGORY_LAUNCHER)) {

                            mService.getActivityStartController().startActivityInPackage(

                            mService.getActivityStartController().startActivityInPackage(

                                    task.mCallingUid, callingPid, callingUid, task.mCallingPackage,

                                    task.mCallingUid, callingPid, callingUid, task.mCallingPackage,

services/core/java/com/android/server/am/LockTaskController.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -555,11 +555,12 @@ public class LockTaskController { 
            return;

            return;

        }

        }





        if (mLockTaskModeTasks.isEmpty()) {

        final Intent taskIntent = task.intent;

        if (mLockTaskModeTasks.isEmpty() && taskIntent != null) {

            mSupervisor.mRecentTasks.onLockTaskModeStateChanged(lockTaskModeState, task.userId);

            mSupervisor.mRecentTasks.onLockTaskModeStateChanged(lockTaskModeState, task.userId);

            // Start lock task on the handler thread

            // Start lock task on the handler thread

            mHandler.post(() -> performStartLockTask(

            mHandler.post(() -> performStartLockTask(

                    task.intent.getComponent().getPackageName(),

                    taskIntent.getComponent().getPackageName(),

                    task.userId,

                    task.userId,

                    lockTaskModeState));

                    lockTaskModeState));

        }

        }

services/core/java/com/android/server/am/RecentTasks.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -550,7 +550,7 @@ class RecentTasks { 
                continue;

                continue;

            }

            }





            ComponentName cn = tr.intent.getComponent();

            ComponentName cn = tr.intent != null ? tr.intent.getComponent() : null;

            final boolean sameComponent = cn != null && cn.getPackageName().equals(packageName)

            final boolean sameComponent = cn != null && cn.getPackageName().equals(packageName)

                    && (filterByClasses == null || filterByClasses.contains(cn.getClassName()));

                    && (filterByClasses == null || filterByClasses.contains(cn.getClassName()));

            if (sameComponent) {

            if (sameComponent) {

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

+9 −6
Original line number Original line Diff line number Diff line
@@ -203,7 +203,8 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
    String rootAffinity;    // Initial base affinity, or null; does not change from initial root.

    String rootAffinity;    // Initial base affinity, or null; does not change from initial root.

    final IVoiceInteractionSession voiceSession;    // Voice interaction session driving task

    final IVoiceInteractionSession voiceSession;    // Voice interaction session driving task

    final IVoiceInteractor voiceInteractor;         // Associated interactor to provide to app

    final IVoiceInteractor voiceInteractor;         // Associated interactor to provide to app

    Intent intent;          // The original intent that started the task.

    Intent intent;          // The original intent that started the task. Note that this value can

                            // be null.

    Intent affinityIntent;  // Intent of affinity-moved activity that started this task.

    Intent affinityIntent;  // Intent of affinity-moved activity that started this task.

    int effectiveUid;       // The current effective uid of the identity of this task.

    int effectiveUid;       // The current effective uid of the identity of this task.

    ComponentName origActivity; // The non-alias activity component of the intent.

    ComponentName origActivity; // The non-alias activity component of the intent.
@@ -897,12 +898,12 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
        // the real activity that will be launched not the alias, so we need to use an intent with

        // the real activity that will be launched not the alias, so we need to use an intent with

        // the component name pointing to the real activity not the alias in the activity record.

        // the component name pointing to the real activity not the alias in the activity record.

        intent.setComponent(r.realActivity);

        intent.setComponent(r.realActivity);

        return this.intent.filterEquals(intent);

        return intent.filterEquals(this.intent);

    }

    }





    boolean returnsToHomeStack() {

    boolean returnsToHomeStack() {

        final int returnHomeFlags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME;

        final int returnHomeFlags = FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME;

        return (intent.getFlags() & returnHomeFlags) == returnHomeFlags;

        return intent != null && (intent.getFlags() & returnHomeFlags) == returnHomeFlags;

    }

    }





    void setPrevAffiliate(TaskRecord prevAffiliate) {

    void setPrevAffiliate(TaskRecord prevAffiliate) {
@@ -2165,9 +2166,11 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 
            out.endTag(null, TAG_AFFINITYINTENT);

            out.endTag(null, TAG_AFFINITYINTENT);

        }

        }





        if (intent != null) {

            out.startTag(null, TAG_INTENT);

            out.startTag(null, TAG_INTENT);

            intent.saveToXml(out);

            intent.saveToXml(out);

            out.endTag(null, TAG_INTENT);

            out.endTag(null, TAG_INTENT);

        }





        final ArrayList<ActivityRecord> activities = mActivities;

        final ArrayList<ActivityRecord> activities = mActivities;

        final int numActivities = activities.size();

        final int numActivities = activities.size();

services/tests/servicestests/src/com/android/server/am/TaskRecordTests.java

+16 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,9 @@ 




package com.android.server.am;

package com.android.server.am;





import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNotNull;
@@ -62,7 +65,7 @@ import java.util.Comparator; 
 * Tests for exercising {@link TaskRecord}.

 * Tests for exercising {@link TaskRecord}.

 *

 *

 * Build/Install/Run:

 * Build/Install/Run:

 *  bit FrameworksServicesTests:com.android.server.am.TaskRecordTests

 *  atest FrameworksServicesTests:com.android.server.am.TaskRecordTests

 */

 */

@MediumTest

@MediumTest

@Presubmit

@Presubmit
@@ -113,6 +116,18 @@ public class TaskRecordTests extends ActivityTestsBase { 
        assertTrue(factory.mCreated);

        assertTrue(factory.mCreated);

    }

    }





    @Test

    public void testReturnsToHomeStack() throws Exception {

        final TaskRecord task = createTaskRecord(1);

        assertFalse(task.returnsToHomeStack());

        task.intent = null;

        assertFalse(task.returnsToHomeStack());

        task.intent = new Intent();

        assertFalse(task.returnsToHomeStack());

        task.intent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME);

        assertTrue(task.returnsToHomeStack());

    }



    private File serializeToFile(TaskRecord r) throws IOException, XmlPullParserException {

    private File serializeToFile(TaskRecord r) throws IOException, XmlPullParserException {

        final File tmpFile = File.createTempFile(r.taskId + "_task_", "xml");

        final File tmpFile = File.createTempFile(r.taskId + "_task_", "xml");