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

Commit 1e2187cf authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Add hidden ATM method to use in TaskFragmentOrganizer 

getActivityBelow() is necessary to check if a split rule should
be applied for two activities on top of each other. This will
only report an activity that belongs to the same process.

When an application starts an activity B on top of an existing
activity A normally, there might be a split rule to put them
side-by-side. Organizer needs to know that activities A and B
are on top of each other to check, so it can either intercept
new activity launch or observe it after it happens and check the
rules then. The second approach results in a cleaner implementation,
but it also means that the organizer needs a reliable way to check
which activity is directly below the launched one. There is no
reliable source of info for that on the client side yet.

Bug: 190433398
Bug: 190433500
Test: Manual, using the reference implementation of the organizer.
Change-Id: I0e0116b1b0144e0ba4d19039d78c34495fbe4457
parent f7224f06

core/java/android/app/ActivityClient.java

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app;



import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Intent;

import android.content.res.Configuration;
@@ -205,6 +206,18 @@ public class ActivityClient { 
        }

    }



    /**

     * Returns the activity token below in the same task if it belongs to the same process.

     */

    @Nullable

    public IBinder getActivityTokenBelow(IBinder activityToken) {

        try {

            return getActivityClientController().getActivityTokenBelow(activityToken);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    ComponentName getCallingActivity(IBinder token) {

        try {

            return getActivityClientController().getCallingActivity(token);

core/java/android/app/IActivityClientController.aidl

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ interface IActivityClientController { 
    boolean willActivityBeVisible(in IBinder token);

    int getDisplayId(in IBinder activityToken);

    int getTaskForActivity(in IBinder token, in boolean onlyRoot);

    IBinder getActivityTokenBelow(IBinder token);

    ComponentName getCallingActivity(in IBinder token);

    String getCallingPackage(in IBinder token);

    int getLaunchedFromUid(in IBinder token);

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

+22 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import static com.android.server.wm.ActivityTaskManagerService.TAG_SWITCH; 
import static com.android.server.wm.ActivityTaskManagerService.enforceNotIsolatedCaller;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;
@@ -538,6 +539,27 @@ class ActivityClientController extends IActivityClientController.Stub { 
        }

    }



    @Override

    @Nullable

    public IBinder getActivityTokenBelow(IBinder activityToken) {

        final long ident = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final ActivityRecord ar = ActivityRecord.isInAnyTask(activityToken);

                if (ar == null) {

                    return null;

                }

                final ActivityRecord below = ar.getTask().getActivityBelow(ar);

                if (below != null && below.getUid() == ar.getUid()) {

                    return below.appToken.asBinder();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

        return null;

    }



    @Override

    public ComponentName getCallingActivity(IBinder token) {

        synchronized (mGlobalLock) {

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

+6 −0
Original line number Diff line number Diff line
@@ -6293,6 +6293,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return null;

    }



    @Nullable

    static ActivityRecord isInAnyTask(IBinder token) {

        final ActivityRecord r = ActivityRecord.forTokenLocked(token);

        return (r != null && r.isAttached()) ? r : null;

    }



    /**

     * @return display id to which this record is attached,

     *         {@link android.view.Display#INVALID_DISPLAY} if not attached.

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

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ class ActivityStarter { 
        ActivityRecord sourceRecord = null;

        ActivityRecord resultRecord = null;

        if (resultTo != null) {

            sourceRecord = mRootWindowContainer.isInAnyTask(resultTo);

            sourceRecord = ActivityRecord.isInAnyTask(resultTo);

            if (DEBUG_RESULTS) {

                Slog.v(TAG_RESULTS, "Will send result to " + resultTo + " " + sourceRecord);

            }