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

Commit 05c94cec authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Move activity-related methods to ActivityRecord"

parents 32786617 79d6798c

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

+474 −23

File changed.

Preview size limit exceeded, changes collapsed.

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

+70 −501

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −5
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import static android.content.pm.PackageManager.PERMISSION_DENIED; 
import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.graphics.Rect.copyOrNull;

import static android.os.PowerManager.PARTIAL_WAKE_LOCK;

import static android.os.Process.INVALID_UID;

import static android.os.Process.SYSTEM_UID;

import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

import static android.view.Display.DEFAULT_DISPLAY;
@@ -1028,9 +1029,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
        if (componentRestriction == ACTIVITY_RESTRICTION_PERMISSION

                || actionRestriction == ACTIVITY_RESTRICTION_PERMISSION) {

            if (resultRecord != null) {

                resultStack.sendActivityResultLocked(-1,

                        resultRecord, resultWho, requestCode,

                        Activity.RESULT_CANCELED, null);

                resultRecord.sendResult(INVALID_UID, resultWho, requestCode,

                        Activity.RESULT_CANCELED, null /* data */);

            }

            final String msg;

            if (actionRestriction == ACTIVITY_RESTRICTION_PERMISSION) {
@@ -1349,7 +1349,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
                    // TODO(b/137329632): Wait for idle of the right activity, not just any.

                    r.destroyIfPossible("activityIdleInternalLocked");

                } else {

                    stack.stopActivityLocked(r);

                    r.stopIfPossible();

                }

            }

        }
@@ -1360,7 +1360,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks { 
            r = finishes.get(i);

            final ActivityStack stack = r.getActivityStack();

            if (stack != null) {

                activityRemoved |= stack.destroyActivityLocked(r, true, "finish-idle");

                activityRemoved |= r.destroyImmediately(true /* removeFromApp */, "finish-idle");

            }

        }

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

+22 −28
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE; 
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK;

import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.Process.INVALID_UID;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;
@@ -752,8 +753,8 @@ class ActivityStarter { 


        if (err != START_SUCCESS) {

            if (resultRecord != null) {

                resultStack.sendActivityResultLocked(

                        -1, resultRecord, resultWho, requestCode, RESULT_CANCELED, null);

                resultRecord.sendResult(INVALID_UID, resultWho, requestCode, RESULT_CANCELED,

                        null /* data */);

            }

            SafeActivityOptions.abort(options);

            return err;
@@ -817,8 +818,8 @@ class ActivityStarter { 


        if (abort) {

            if (resultRecord != null) {

                resultStack.sendActivityResultLocked(-1, resultRecord, resultWho, requestCode,

                        RESULT_CANCELED, null);

                resultRecord.sendResult(INVALID_UID, resultWho, requestCode, RESULT_CANCELED,

                        null /* data */);

            }

            // We pretend to the caller that it was really started, but

            // they will just get a cancel result.
@@ -1450,18 +1451,17 @@ class ActivityStarter { 
     * TODO(b/131748165): Refactor the logic so we don't need to call this method everywhere.

     */

    private boolean handleBackgroundActivityAbort(ActivityRecord r) {

        // TODO(b/131747138): Remove toast and refactor related code in Q release.

        boolean abort = !mService.isBackgroundActivityStartsEnabled();

        // TODO(b/131747138): Remove toast and refactor related code in R release.

        final boolean abort = !mService.isBackgroundActivityStartsEnabled();

        if (!abort) {

            return false;

        }

        ActivityRecord resultRecord = r.resultTo;

        String resultWho = r.resultWho;

        final ActivityRecord resultRecord = r.resultTo;

        final String resultWho = r.resultWho;

        int requestCode = r.requestCode;

        if (resultRecord != null) {

            ActivityStack resultStack = resultRecord.getActivityStack();

            resultStack.sendActivityResultLocked(-1, resultRecord, resultWho, requestCode,

                    RESULT_CANCELED, null);

            resultRecord.sendResult(INVALID_UID, resultWho, requestCode, RESULT_CANCELED,

                    null /* data */);

        }

        // We pretend to the caller that it was really started to make it backward compatible, but

        // they will just get a cancel result.
@@ -1626,12 +1626,9 @@ class ActivityStarter { 
        }



        if (mStartActivity.packageName == null) {

            final ActivityStack sourceStack = mStartActivity.resultTo != null

                    ? mStartActivity.resultTo.getActivityStack() : null;

            if (sourceStack != null) {

                sourceStack.sendActivityResultLocked(-1 /* callingUid */, mStartActivity.resultTo,

                        mStartActivity.resultWho, mStartActivity.requestCode, RESULT_CANCELED,

                        null /* data */);

            if (mStartActivity.resultTo != null) {

                mStartActivity.resultTo.sendResult(INVALID_UID, mStartActivity.resultWho,

                        mStartActivity.requestCode, RESULT_CANCELED, null /* data */);

            }

            ActivityOptions.abort(mOptions);

            return START_CLASS_NOT_FOUND;
@@ -1708,8 +1705,8 @@ class ActivityStarter { 
            EventLog.writeEvent(EventLogTags.AM_CREATE_TASK, mStartActivity.mUserId,

                    mStartActivity.getTaskRecord().taskId);

        }

        ActivityStack.logStartActivity(

                EventLogTags.AM_CREATE_ACTIVITY, mStartActivity, mStartActivity.getTaskRecord());

        mStartActivity.logStartActivity(

                EventLogTags.AM_CREATE_ACTIVITY, mStartActivity.getTaskRecord());

        mTargetStack.mLastPausedActivity = null;



        mRootActivityContainer.sendPowerHintForLaunchStartIfNeeded(
@@ -1927,17 +1924,14 @@ class ActivityStarter { 
    }



    private void sendNewTaskResultRequestIfNeeded() {

        final ActivityStack sourceStack = mStartActivity.resultTo != null

                ? mStartActivity.resultTo.getActivityStack() : null;

        if (sourceStack != null && (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {

        if (mStartActivity.resultTo != null && (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {

            // For whatever reason this activity is being launched into a new task...

            // yet the caller has requested a result back.  Well, that is pretty messed up,

            // so instead immediately send back a cancel and let the new task continue launched

            // as normal without a dependency on its originator.

            Slog.w(TAG, "Activity is launching as a new task, so cancelling activity result.");

            sourceStack.sendActivityResultLocked(-1 /* callingUid */, mStartActivity.resultTo,

                    mStartActivity.resultWho, mStartActivity.requestCode, RESULT_CANCELED,

                    null /* data */);

            mStartActivity.resultTo.sendResult(INVALID_UID, mStartActivity.resultWho,

                    mStartActivity.requestCode, RESULT_CANCELED, null /* data */);

            mStartActivity.resultTo = null;

        }

    }
@@ -2362,7 +2356,7 @@ class ActivityStarter { 
            return;

        }



        ActivityStack.logStartActivity(AM_NEW_INTENT, activity, activity.getTaskRecord());

        activity.logStartActivity(AM_NEW_INTENT, activity.getTaskRecord());

        activity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent,

                mStartActivity.launchedFromPackage);

        mIntentDelivered = true;
@@ -2429,7 +2423,7 @@ class ActivityStarter { 
            ActivityRecord top = sourceTask.performClearTaskLocked(mStartActivity, mLaunchFlags);

            mKeepCurTransition = true;

            if (top != null) {

                ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, top.getTaskRecord());

                mStartActivity.logStartActivity(AM_NEW_INTENT, top.getTaskRecord());

                deliverNewIntent(top);

                // For paranoia, make sure we have correctly resumed the top activity.

                mTargetStack.mLastPausedActivity = null;
@@ -2448,7 +2442,7 @@ class ActivityStarter { 
                final TaskRecord task = top.getTaskRecord();

                task.moveActivityToFrontLocked(top);

                top.updateOptionsLocked(mOptions);

                ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, task);

                mStartActivity.logStartActivity(AM_NEW_INTENT, task);

                deliverNewIntent(top);

                mTargetStack.mLastPausedActivity = null;

                if (mDoResume) {

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

+10 −7
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEME 
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;

import static android.os.Build.VERSION_CODES.N;

import static android.os.FactoryTest.FACTORY_TEST_HIGH_LEVEL;

import static android.os.FactoryTest.FACTORY_TEST_LOW_LEVEL;

import static android.os.FactoryTest.FACTORY_TEST_OFF;
@@ -1754,9 +1753,14 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
    public final void activityDestroyed(IBinder token) {

        if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "ACTIVITY DESTROYED: " + token);

        synchronized (mGlobalLock) {

            ActivityStack stack = ActivityRecord.getStackLocked(token);

            if (stack != null) {

                stack.activityDestroyedLocked(token, "activityDestroyed");

            final long origId = Binder.clearCallingIdentity();

            try {

                final ActivityRecord activity = ActivityRecord.forTokenLocked(token);

                if (activity != null) {

                    activity.destroyed("activityDestroyed");

                }

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

        }

    }
@@ -3237,7 +3241,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                if (r == null) {

                    return false;

                }

                return r.getActivityStack().safelyDestroyActivityLocked(r, "app-req");

                return r.safelyDestroy("app-req");

            } finally {

                Binder.restoreCallingIdentity(origId);

            }
@@ -6485,8 +6489,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            synchronized (mGlobalLock) {

                final ActivityRecord r = ActivityRecord.isInStackLocked(activityToken);

                if (r != null && r.getActivityStack() != null) {

                    r.getActivityStack().sendActivityResultLocked(callingUid, r, resultWho,

                            requestCode, resultCode, data);

                    r.sendResult(callingUid, resultWho, requestCode, resultCode, data);

                }

            }

        }