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

Commit 5c35ee1c authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Enable SC registry in the Shell" into udc-dev am: 23e27732 

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



Change-Id: Ib39d751d821e6c3c9938cbbd010487dd5c8cc976
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f850ac44 23e27732

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -732,10 +732,11 @@ public abstract class WMShellBaseModule { 




    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    static ShellController provideShellController(ShellInit shellInit,

    static ShellController provideShellController(Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellCommandHandler shellCommandHandler,

            @ShellMainThread ShellExecutor mainExecutor) {

            @ShellMainThread ShellExecutor mainExecutor) {

        return new ShellController(shellInit, shellCommandHandler, mainExecutor);

        return new ShellController(context, shellInit, shellCommandHandler, mainExecutor);

    }

    }





    //

    //

libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java

+18 −3
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.pm.UserInfo; 
import android.content.res.Configuration;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.Bundle;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.view.SurfaceControlRegistry;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;
@@ -52,6 +53,7 @@ import java.util.function.Supplier; 
public class ShellController {

public class ShellController {

    private static final String TAG = ShellController.class.getSimpleName();

    private static final String TAG = ShellController.class.getSimpleName();





    private final Context mContext;

    private final ShellInit mShellInit;

    private final ShellInit mShellInit;

    private final ShellCommandHandler mShellCommandHandler;

    private final ShellCommandHandler mShellCommandHandler;

    private final ShellExecutor mMainExecutor;

    private final ShellExecutor mMainExecutor;
@@ -72,8 +74,11 @@ public class ShellController { 
    private Configuration mLastConfiguration;

    private Configuration mLastConfiguration;









    public ShellController(ShellInit shellInit, ShellCommandHandler shellCommandHandler,

    public ShellController(Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellExecutor mainExecutor) {

            ShellExecutor mainExecutor) {

        mContext = context;

        mShellInit = shellInit;

        mShellInit = shellInit;

        mShellCommandHandler = shellCommandHandler;

        mShellCommandHandler = shellCommandHandler;

        mMainExecutor = mainExecutor;

        mMainExecutor = mainExecutor;
@@ -254,6 +259,16 @@ public class ShellController { 
        }

        }

    }

    }





    private void handleInit() {

        SurfaceControlRegistry.createProcessInstance(mContext);

        mShellInit.init();

    }



    private void handleDump(PrintWriter pw) {

        mShellCommandHandler.dump(pw);

        SurfaceControlRegistry.dump(100 /* limit */, false /* runGc */, pw);

    }



    public void dump(@NonNull PrintWriter pw, String prefix) {

    public void dump(@NonNull PrintWriter pw, String prefix) {

        final String innerPrefix = prefix + "  ";

        final String innerPrefix = prefix + "  ";

        pw.println(prefix + TAG);

        pw.println(prefix + TAG);
@@ -279,7 +294,7 @@ public class ShellController { 
        @Override

        @Override

        public void onInit() {

        public void onInit() {

            try {

            try {

                mMainExecutor.executeBlocking(() -> mShellInit.init());

                mMainExecutor.executeBlocking(() -> ShellController.this.handleInit());

            } catch (InterruptedException e) {

            } catch (InterruptedException e) {

                throw new RuntimeException("Failed to initialize the Shell in 2s", e);

                throw new RuntimeException("Failed to initialize the Shell in 2s", e);

            }

            }
@@ -344,7 +359,7 @@ public class ShellController { 
        @Override

        @Override

        public void dump(PrintWriter pw) {

        public void dump(PrintWriter pw) {

            try {

            try {

                mMainExecutor.executeBlocking(() -> mShellCommandHandler.dump(pw));

                mMainExecutor.executeBlocking(() -> ShellController.this.handleDump(pw));

            } catch (InterruptedException e) {

            } catch (InterruptedException e) {

                throw new RuntimeException("Failed to dump the Shell in 2s", e);

                throw new RuntimeException("Failed to dump the Shell in 2s", e);

            }

            }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ public class PipControllerTest extends ShellTestCase { 
            return null;

            return null;

        }).when(mMockExecutor).execute(any());

        }).when(mMockExecutor).execute(any());

        mShellInit = spy(new ShellInit(mMockExecutor));

        mShellInit = spy(new ShellInit(mMockExecutor));

        mShellController = spy(new ShellController(mShellInit, mMockShellCommandHandler,

        mShellController = spy(new ShellController(mContext, mShellInit, mMockShellCommandHandler,

                mMockExecutor));

                mMockExecutor));

        mPipController = new PipController(mContext, mShellInit, mMockShellCommandHandler,

        mPipController = new PipController(mContext, mShellInit, mMockShellCommandHandler,

                mShellController, mMockDisplayController, mMockPipAnimationController,

                mShellController, mMockDisplayController, mMockPipAnimationController,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ public class RecentTasksControllerTest extends ShellTestCase { 
        mMainExecutor = new TestShellExecutor();

        mMainExecutor = new TestShellExecutor();

        when(mContext.getPackageManager()).thenReturn(mock(PackageManager.class));

        when(mContext.getPackageManager()).thenReturn(mock(PackageManager.class));

        mShellInit = spy(new ShellInit(mMainExecutor));

        mShellInit = spy(new ShellInit(mMainExecutor));

        mShellController = spy(new ShellController(mShellInit, mShellCommandHandler,

        mShellController = spy(new ShellController(mContext, mShellInit, mShellCommandHandler,

                mMainExecutor));

                mMainExecutor));

        mRecentTasksControllerReal = new RecentTasksController(mContext, mShellInit,

        mRecentTasksControllerReal = new RecentTasksController(mContext, mShellInit,

                mShellController, mShellCommandHandler, mTaskStackListener, mActivityTaskManager,

                mShellController, mShellCommandHandler, mTaskStackListener, mActivityTaskManager,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ public class SplitScreenControllerTests extends ShellTestCase { 
    public void setup() {

    public void setup() {

        assumeTrue(ActivityTaskManager.supportsSplitScreenMultiWindow(mContext));

        assumeTrue(ActivityTaskManager.supportsSplitScreenMultiWindow(mContext));

        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        mShellController = spy(new ShellController(mShellInit, mShellCommandHandler,

        mShellController = spy(new ShellController(mContext, mShellInit, mShellCommandHandler,

                mMainExecutor));

                mMainExecutor));

        mSplitScreenController = spy(new SplitScreenController(mContext, mShellInit,

        mSplitScreenController = spy(new SplitScreenController(mContext, mShellInit,

                mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue,

                mShellCommandHandler, mShellController, mTaskOrganizer, mSyncQueue,