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

Commit 4e1498ac authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Strip part of the activity info of another uid if no privilege am: e534fa2a 

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



Change-Id: I44c7471815da6c38090c4ce74b40752cec25a756
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c978f0ec e534fa2a

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class AppTaskImpl extends IAppTask.Stub { 
                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                }

                return mService.getRecentTasks().createRecentTaskInfo(task,

                        false /* stripExtras */);

                        false /* stripExtras */, true /* getTasksAllowed */);

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

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

+6 −2
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ class RecentTasks { 
                continue;

            }



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

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

        }

        return res;

    }
@@ -1834,12 +1834,16 @@ class RecentTasks { 
    /**

     * Creates a new RecentTaskInfo from a Task.

     */

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

    ActivityManager.RecentTaskInfo createRecentTaskInfo(Task tr, boolean stripExtras,

            boolean getTasksAllowed) {

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

        tr.fillTaskInfo(rti, stripExtras);

        // Fill in some deprecated values

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

        rti.persistentId = rti.taskId;

        if (!getTasksAllowed) {

            Task.trimIneffectiveInfo(tr, rti);

        }

        return rti;

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ class RunningTasks { 
        final RunningTaskInfo rti = task.getTaskInfo();

        // Fill in some deprecated values

        rti.id = rti.taskId;



        if (!mAllowed) {

            Task.trimIneffectiveInfo(task, rti);

        }

        return rti;

    }

}

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

+48 −0
Original line number Diff line number Diff line
@@ -3653,6 +3653,54 @@ class Task extends WindowContainer<WindowContainer> { 
                : SCREEN_ORIENTATION_UNSET;

    }



    /**

     * Removes the activity info if the activity belongs to a different uid, which is

     * different from the app that hosts the task.

     */

    static void trimIneffectiveInfo(Task task, TaskInfo info) {

        final ActivityRecord baseActivity = task.getActivity(r -> !r.finishing,

                false /* traverseTopToBottom */);

        final int baseActivityUid =

                baseActivity != null ? baseActivity.getUid() : task.effectiveUid;



        if (info.topActivityInfo != null

                && task.effectiveUid != info.topActivityInfo.applicationInfo.uid) {

            // Making a copy to prevent eliminating the info in the original ActivityRecord.

            info.topActivityInfo = new ActivityInfo(info.topActivityInfo);

            info.topActivityInfo.applicationInfo =

                    new ApplicationInfo(info.topActivityInfo.applicationInfo);



            // Strip the sensitive info.

            info.topActivity = new ComponentName("", "");

            info.topActivityInfo.packageName = "";

            info.topActivityInfo.taskAffinity = "";

            info.topActivityInfo.processName = "";

            info.topActivityInfo.name = "";

            info.topActivityInfo.parentActivityName = "";

            info.topActivityInfo.targetActivity = "";

            info.topActivityInfo.splitName = "";

            info.topActivityInfo.applicationInfo.className = "";

            info.topActivityInfo.applicationInfo.credentialProtectedDataDir = "";

            info.topActivityInfo.applicationInfo.dataDir = "";

            info.topActivityInfo.applicationInfo.deviceProtectedDataDir = "";

            info.topActivityInfo.applicationInfo.manageSpaceActivityName = "";

            info.topActivityInfo.applicationInfo.nativeLibraryDir = "";

            info.topActivityInfo.applicationInfo.nativeLibraryRootDir = "";

            info.topActivityInfo.applicationInfo.processName = "";

            info.topActivityInfo.applicationInfo.publicSourceDir = "";

            info.topActivityInfo.applicationInfo.scanPublicSourceDir = "";

            info.topActivityInfo.applicationInfo.scanSourceDir = "";

            info.topActivityInfo.applicationInfo.sourceDir = "";

            info.topActivityInfo.applicationInfo.taskAffinity = "";

            info.topActivityInfo.applicationInfo.name = "";

            info.topActivityInfo.applicationInfo.packageName = "";

        }



        if (task.effectiveUid != baseActivityUid) {

            info.baseActivity = new ComponentName("", "");

        }

    }



    /**

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

     */