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

Commit 02757715 authored by Winson Chung's avatar Winson Chung
Browse files

Allow app tasks api to fetch its own task base-intent extras 

- We strip it for other callers where we know we don't need the info
  but apps might need this for some reason

Bug: 159649017
Test: atest AppTaskTests#testBaseIntentHasExtras
Change-Id: I3365989cad92e557f1143f52ffd77e85f8618c0d
parent 449851f8

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

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ class AppTaskImpl extends IAppTask.Stub { 
                if (task == null) {

                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                }

                return mService.getRecentTasks().createRecentTaskInfo(task);

                return mService.getRecentTasks().createRecentTaskInfo(task,

                        false /* stripExtras */);

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

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

+3 −3
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ class RecentTasks { 
                continue;

            }



            res.add(createRecentTaskInfo(task));

            res.add(createRecentTaskInfo(task, true /* stripExtras */));

        }

        return res;

    }
@@ -1832,9 +1832,9 @@ class RecentTasks { 
    /**

     * Creates a new RecentTaskInfo from a Task.

     */

    ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr) {

    ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr, boolean stripExtras) {

        ActivityManager.RecentTaskInfo rti = new ActivityManager.RecentTaskInfo();

        tr.fillTaskInfo(rti);

        tr.fillTaskInfo(rti, stripExtras);

        // Fill in some deprecated values

        rti.id = rti.isRunning ? rti.taskId : INVALID_TASK_ID;

        rti.persistentId = rti.taskId;

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

+11 −1
Original line number Diff line number Diff line
@@ -3551,11 +3551,19 @@ class Task extends WindowContainer<WindowContainer> { 
        }

    }





    /**

     * Fills in a {@link TaskInfo} with information from this task. Note that the base intent in the

     * task info will not include any extras or clip data.

     */

    void fillTaskInfo(TaskInfo info) {

        fillTaskInfo(info, true /* stripExtras */);

    }



    /**

     * Fills in a {@link TaskInfo} with information from this task.

     */

    void fillTaskInfo(TaskInfo info, boolean stripExtras) {

        getNumRunningActivities(mReuseActivitiesReport);

        info.userId = mUserId;

        info.stackId = getRootTaskId();
@@ -3566,7 +3574,9 @@ class Task extends WindowContainer<WindowContainer> { 
        // Make a copy of base intent because this is like a snapshot info.

        // Besides, {@link RecentTasks#getRecentTasksImpl} may modify it.

        final int baseIntentFlags = baseIntent == null ? 0 : baseIntent.getFlags();

        info.baseIntent = baseIntent == null ? new Intent() : baseIntent.cloneFilter();

        info.baseIntent = baseIntent == null

                ? new Intent()

                : stripExtras ? baseIntent.cloneFilter() : new Intent(baseIntent);

        info.baseIntent.setFlags(baseIntentFlags);

        info.baseActivity = mReuseActivitiesReport.base != null

                ? mReuseActivitiesReport.base.intent.getComponent()