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

Commit 365f30e1 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Pass LayoutParams from SCVH to Parent window" into udc-qpr-dev am: c87fc5e7 am: dd6dd383

parents 4b3909ac dd6dd383
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -151,10 +151,11 @@ public class SurfaceControlViewHost {
        private SurfaceControl mSurfaceControl;
        private final IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection;
        private final IBinder mInputToken;
        @NonNull
        private final ISurfaceControlViewHost mRemoteInterface;

        SurfacePackage(SurfaceControl sc, IAccessibilityEmbeddedConnection connection,
               IBinder inputToken, ISurfaceControlViewHost ri) {
                IBinder inputToken, @NonNull ISurfaceControlViewHost ri) {
            mSurfaceControl = sc;
            mAccessibilityEmbeddedConnection = connection;
            mInputToken = inputToken;
@@ -216,6 +217,7 @@ public class SurfaceControlViewHost {
        /**
         * @hide
         */
        @NonNull
        public ISurfaceControlViewHost getRemoteInterface() {
            return mRemoteInterface;
        }
+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.SysuiTestCase;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations;
@RunWithLooper
@RunWith(AndroidTestingRunner.class)
@SmallTest
@Ignore("b/286245842")
public class AdminSecondaryLockScreenControllerTest extends SysuiTestCase {

    private static final int TARGET_USER_ID = KeyguardUpdateMonitor.getCurrentUser();