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

Commit 4c07d024 authored by Craig Mautner's avatar Craig Mautner
Browse files

Merge commit 'f5030ecb' into manualmerge 

Conflicts:
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: Ie38e3e8b82f588d36e955664904f3ab84bdfaaf5
parents 069438d3 f5030ecb

core/java/android/app/ActivityView.java

+12 −5
Original line number Diff line number Diff line
@@ -354,9 +354,11 @@ public class ActivityView extends ViewGroup { 
    private static class ActivityContainerWrapper {

        private final IActivityContainer mIActivityContainer;

        private final CloseGuard mGuard = CloseGuard.get();

        boolean mOpened; // Protected by mGuard.



        ActivityContainerWrapper(IActivityContainer container) {

            mIActivityContainer = container;

            mOpened = true;

            mGuard.open("release");

        }
@@ -424,12 +426,17 @@ public class ActivityView extends ViewGroup { 
        }



        void release() {

            synchronized (mGuard) {

                if (mOpened) {

                    if (DEBUG) Log.v(TAG, "ActivityContainerWrapper: release called");

                    try {

                        mIActivityContainer.release();

                        mGuard.close();

                    } catch (RemoteException e) {

                    }

                    mOpened = false;

                }

            }

        }



        @Override

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

+10 −5
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ import static com.android.server.am.ActivityManagerService.VALIDATE_TOKENS; 


import static com.android.server.am.ActivityStackSupervisor.DEBUG_ADD_REMOVE;

import static com.android.server.am.ActivityStackSupervisor.DEBUG_APP;

import static com.android.server.am.ActivityStackSupervisor.DEBUG_CONTAINERS;

import static com.android.server.am.ActivityStackSupervisor.DEBUG_SAVED_STATE;

import static com.android.server.am.ActivityStackSupervisor.DEBUG_SCREENSHOTS;

import static com.android.server.am.ActivityStackSupervisor.DEBUG_STATES;

import static com.android.server.am.ActivityStackSupervisor.HOME_STACK_ID;



import android.service.voice.IVoiceInteractionSession;

import com.android.internal.app.IVoiceInteractor;

import com.android.internal.os.BatteryStatsImpl;

import com.android.server.Watchdog;
@@ -74,6 +74,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.Trace;

import android.os.UserHandle;

import android.service.voice.IVoiceInteractionSession;

import android.util.EventLog;

import android.util.Slog;

import android.view.Display;
@@ -1405,7 +1406,7 @@ final class ActivityStack { 


        ActivityRecord parent = mActivityContainer.mParentActivity;

        if ((parent != null && parent.state != ActivityState.RESUMED) ||

                !mActivityContainer.isAttached()) {

                !mActivityContainer.isAttachedLocked()) {

            // Do not resume this stack if its parent is not resumed.

            // TODO: If in a loop, make sure that parent stack resumeTopActivity is called 1st.

            return false;
@@ -2677,11 +2678,14 @@ final class ActivityStack { 
                || prevState == ActivityState.INITIALIZING) {

            // If this activity is already stopped, we can just finish

            // it right now.

            boolean activityRemoved = destroyActivityLocked(r, true,

                    oomAdj, "finish-imm");

            r.makeFinishing();

            boolean activityRemoved = destroyActivityLocked(r, true, oomAdj, "finish-imm");

            if (activityRemoved) {

                mStackSupervisor.resumeTopActivitiesLocked();

            }

            if (DEBUG_CONTAINERS) Slog.d(TAG, 

                    "destroyActivityLocked: finishCurrentActivityLocked r=" + r +

                    " destroy returned removed=" + activityRemoved);

            return activityRemoved ? null : r;

        }
@@ -3044,6 +3048,7 @@ final class ActivityStack { 
            if (r != null) {

                mHandler.removeMessages(DESTROY_TIMEOUT_MSG, r);

            }

            if (DEBUG_CONTAINERS) Slog.d(TAG, "activityDestroyedLocked: r=" + r);



            if (isInStackLocked(token) != null) {

                if (r.state == ActivityState.DESTROYING) {
@@ -3803,7 +3808,7 @@ final class ActivityStack { 
                mStacks.remove(this);

                mStacks.add(0, this);

            }

            mActivityContainer.onTaskListEmpty();

            mActivityContainer.onTaskListEmptyLocked();

        }

    }

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

+57 −30
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    static final boolean DEBUG_STATES = DEBUG || false;

    static final boolean DEBUG_IDLE = DEBUG || false;

    static final boolean DEBUG_SCREENSHOTS = DEBUG || false;

    static final boolean DEBUG_CONTAINERS = DEBUG || false;



    public static final int HOME_STACK_ID = 0;
@@ -135,6 +136,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    static final int LOCK_TASK_START_MSG = FIRST_SUPERVISOR_STACK_MSG + 9;

    static final int LOCK_TASK_END_MSG = FIRST_SUPERVISOR_STACK_MSG + 10;

    static final int CONTAINER_CALLBACK_TASK_LIST_EMPTY = FIRST_SUPERVISOR_STACK_MSG + 11;

    static final int CONTAINER_TASK_LIST_EMPTY_TIMEOUT = FIRST_SUPERVISOR_STACK_MSG + 12;



    private final static String VIRTUAL_DISPLAY_BASE_NAME = "ActivityViewVirtualDisplay";
@@ -239,7 +241,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 


    // TODO: Add listener for removal of references.

    /** Mapping from (ActivityStack/TaskStack).mStackId to their current state */

    SparseArray<ActivityContainer> mActivityContainers = new SparseArray<ActivityContainer>();

    private SparseArray<ActivityContainer> mActivityContainers = new SparseArray<ActivityContainer>();



    /** Mapping from displayId to display current state */

    private final SparseArray<ActivityDisplay> mActivityDisplays =
@@ -2255,8 +2257,10 @@ public final class ActivityStackSupervisor implements DisplayListener { 


    ActivityContainer createActivityContainer(ActivityRecord parentActivity,

            IActivityContainerCallback callback) {

        ActivityContainer activityContainer = new VirtualActivityContainer(parentActivity, callback);

        ActivityContainer activityContainer =

                new VirtualActivityContainer(parentActivity, callback);

        mActivityContainers.put(activityContainer.mStackId, activityContainer);

        if (DEBUG_CONTAINERS) Slog.d(TAG, "createActivityContainer: " + activityContainer);

        parentActivity.mChildContainers.add(activityContainer);

        return activityContainer;

    }
@@ -2265,6 +2269,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        final ArrayList<ActivityContainer> childStacks = parentActivity.mChildContainers;

        for (int containerNdx = childStacks.size() - 1; containerNdx >= 0; --containerNdx) {

            ActivityContainer container = childStacks.remove(containerNdx);

            if (DEBUG_CONTAINERS) Slog.d(TAG, "removeChildActivityContainers: removing " +

                    container);

            container.release();

        }

    }
@@ -2272,11 +2278,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    void deleteActivityContainer(IActivityContainer container) {

        ActivityContainer activityContainer = (ActivityContainer)container;

        if (activityContainer != null) {

            activityContainer.mStack.finishAllActivitiesLocked();

            final ActivityRecord parent = activityContainer.mParentActivity;

            if (parent != null) {

                parent.mChildContainers.remove(activityContainer);

            }

            if (DEBUG_CONTAINERS) Slog.d(TAG, "deleteActivityContainer: ",

                    new RuntimeException("here").fillInStackTrace());

            final int stackId = activityContainer.mStackId;

            mActivityContainers.remove(stackId);

            mWindowManager.removeStack(stackId);
@@ -3128,6 +3131,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                        }

                    }

                } break;

                case CONTAINER_TASK_LIST_EMPTY_TIMEOUT: {

                    synchronized (mService) {

                        Slog.w(TAG, "Timeout waiting for all activities in task to finish. " +

                                msg.obj);

                        ((ActivityContainer) msg.obj).onTaskListEmptyLocked();

                    }

                } break;

            }

        }

    }
@@ -3184,9 +3194,11 @@ public final class ActivityStackSupervisor implements DisplayListener { 


        @Override

        public int getDisplayId() {

            synchronized (mService) {

                if (mActivityDisplay != null) {

                    return mActivityDisplay.mDisplayId;

                }

            }

            return -1;

        }
@@ -3194,11 +3206,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        public boolean injectEvent(InputEvent event) {

            final long origId = Binder.clearCallingIdentity();

            try {

                synchronized (mService) {

                    if (mActivityDisplay != null) {

                        return mInputManagerInternal.injectInputEvent(event,

                                mActivityDisplay.mDisplayId,

                                InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);

                    }

                }

                return false;

            } finally {

                Binder.restoreCallingIdentity(origId);
@@ -3207,10 +3221,16 @@ public final class ActivityStackSupervisor implements DisplayListener { 


        @Override

        public void release() {

            synchronized (mService) {

                if (mContainerState == CONTAINER_STATE_FINISHING) {

                    return;

                }

                mContainerState = CONTAINER_STATE_FINISHING;

                final Message msg =

                        mHandler.obtainMessage(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);

                mHandler.sendMessageDelayed(msg, 1000);

                mStack.finishAllActivitiesLocked();

            detachLocked();

            mWindowManager.removeStack(mStackId);

            }

        }



        private void detachLocked() {
@@ -3301,17 +3321,19 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            return ActivityStackSupervisor.this;

        }



        boolean isAttached() {

        boolean isAttachedLocked() {

            return mActivityDisplay != null;

        }



        void getBounds(Point outBounds) {

            synchronized (mService) {

                    if (mActivityDisplay != null) {

                    mActivityDisplay.getBounds(outBounds);

                } else {

                    outBounds.set(0, 0);

                }

            }

        }



        // TODO: Make sure every change to ActivityRecord.visible results in a call to this.

        void setVisible(boolean visible) {
@@ -3332,7 +3354,12 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            return true;

        }



        void onTaskListEmpty() {

        void onTaskListEmptyLocked() {

            mHandler.removeMessages(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);

            if (!mStack.isHomeStack()) {

                detachLocked();

                deleteActivityContainer(this);

            }

            mHandler.obtainMessage(CONTAINER_CALLBACK_TASK_LIST_EMPTY, this).sendToTarget();

        }
@@ -3351,7 +3378,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            mParentActivity = parent;

            mCallback = callback;

            mContainerState = CONTAINER_STATE_NO_SURFACE;

            mIdString = "VirtualActivtyContainer{" + mStackId + ", parent=" + mParentActivity + "}";

            mIdString = "VirtualActivityContainer{" + mStackId + ", parent=" + mParentActivity + "}";

        }



        @Override
@@ -3397,22 +3424,22 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                }

            }



            setSurfaceIfReady();

            setSurfaceIfReadyLocked();



            if (DEBUG_STACK) Slog.d(TAG, "setSurface: " + this + " to display="

                    + virtualActivityDisplay);

        }



        @Override

        boolean isAttached() {

            return mSurface != null && super.isAttached();

        boolean isAttachedLocked() {

            return mSurface != null && super.isAttachedLocked();

        }



        @Override

        void setDrawn() {

            synchronized (mService) {

                mDrawn = true;

                setSurfaceIfReady();

                setSurfaceIfReadyLocked();

            }

        }
@@ -3422,8 +3449,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            return false;

        }



        private void setSurfaceIfReady() {

            if (DEBUG_STACK) Slog.v(TAG, "setSurfaceIfReady: mDrawn=" + mDrawn +

        private void setSurfaceIfReadyLocked() {

            if (DEBUG_STACK) Slog.v(TAG, "setSurfaceIfReadyLocked: mDrawn=" + mDrawn +

                    " mContainerState=" + mContainerState + " mSurface=" + mSurface);

            if (mDrawn && mSurface != null && mContainerState == CONTAINER_STATE_NO_SURFACE) {

                ((VirtualActivityDisplay) mActivityDisplay).setSurface(mSurface);