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

Commit c6d9fb3d authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Disable AE component for device that doesn't support multi window" into main

parents 605265f5 80841e1b

libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ 


package androidx.window.extensions;



import android.app.ActivityTaskManager;

import android.app.ActivityThread;

import android.app.Application;

import android.content.Context;

import android.window.TaskFragmentOrganizer;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.window.common.DeviceStateManagerFoldingFeatureProducer;

import androidx.window.common.RawFoldingFeatureProducer;

import androidx.window.extensions.area.WindowAreaComponent;
@@ -111,9 +113,13 @@ public class WindowExtensionsImpl implements WindowExtensions { 
     * {@link WindowExtensions#getWindowLayoutComponent()}.

     * @return {@link ActivityEmbeddingComponent} OEM implementation.

     */

    @NonNull

    @Nullable

    public ActivityEmbeddingComponent getActivityEmbeddingComponent() {

        if (mSplitController == null) {

            if (!ActivityTaskManager.supportsMultiWindow(getApplication())) {

                // Disable AE for device that doesn't support multi window.

                return null;

            }

            synchronized (mLock) {

                if (mSplitController == null) {

                    mSplitController = new SplitController(

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java

+8 −1
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 


package androidx.window.extensions;



import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.google.common.truth.Truth.assertThat;



import android.app.ActivityTaskManager;

import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -52,7 +55,11 @@ public class WindowExtensionsTest { 


    @Test

    public void testGetActivityEmbeddingComponent() {

        if (ActivityTaskManager.supportsMultiWindow(getInstrumentation().getContext())) {

            assertThat(mExtensions.getActivityEmbeddingComponent()).isNotNull();

        } else {

            assertThat(mExtensions.getActivityEmbeddingComponent()).isNull();

        }

    }



    @Test