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

Commit 2b669cb9 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

[dw_logging] Use Uid of the base app instead of user id in 

DESKTOP_MODE_SESSION_TASK_UPDATE logs.

Test: Tested locally that uid logged corresponds to the package name of
the top activity.
Bug: 358099125
Flag: EXEMPT bug fix

Change-Id: Iea56f990a2630e78c2571dbd2b6b686f18baae2d
parent cc408f1c

core/java/android/app/TaskInfo.java

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ public class TaskInfo { 
     */

    public int taskId;



    /**

     * The current effective uid of the identity of this task.

     * @hide

     */

    public int effectiveUid;



    /**

     * Whether or not this task has any running activities.

     */
@@ -491,6 +497,7 @@ public class TaskInfo { 
    void readFromParcel(Parcel source) {

        userId = source.readInt();

        taskId = source.readInt();

        effectiveUid = source.readInt();

        displayId = source.readInt();

        isRunning = source.readBoolean();

        baseIntent = source.readTypedObject(Intent.CREATOR);
@@ -541,6 +548,7 @@ public class TaskInfo { 
    void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(userId);

        dest.writeInt(taskId);

        dest.writeInt(effectiveUid);

        dest.writeInt(displayId);

        dest.writeBoolean(isRunning);

        dest.writeTypedObject(baseIntent, 0);
@@ -589,6 +597,7 @@ public class TaskInfo { 
    @Override

    public String toString() {

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

                + " effectiveUid=" + effectiveUid

                + " displayId=" + displayId

                + " isRunning=" + isRunning

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

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeLoggerTransitionObserver.kt

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ class DesktopModeLoggerTransitionObserver( 
        val positionInParent = taskInfo.positionInParent

        return TaskUpdate(

            instanceId = taskInfo.taskId,

            uid = taskInfo.userId,

            uid = taskInfo.effectiveUid,

            taskHeight = screenBounds.height(),

            taskWidth = screenBounds.width(),

            taskX = positionInParent.x,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeLoggerTransitionObserverTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ class DesktopModeLoggerTransitionObserverTest : ShellTestCase() { 
    ) =

        ActivityManager.RunningTaskInfo().apply {

          taskId = id

          userId = uid

          effectiveUid = uid

          configuration.windowConfiguration.apply {

            windowingMode = windowMode

            positionInParent = Point(taskX, taskY)

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

+1 −0
Original line number Diff line number Diff line
@@ -3330,6 +3330,7 @@ class Task extends TaskFragment { 


        info.userId = isLeafTask() ? mUserId : mCurrentUser;

        info.taskId = mTaskId;

        info.effectiveUid = effectiveUid;

        info.displayId = getDisplayId();

        info.displayAreaFeatureId = tda != null ? tda.mFeatureId : FEATURE_UNDEFINED;

        final Intent baseIntent = getBaseIntent();