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

Commit 34187898 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Set recents policy to default on session close." into main

parents 71331759 d7822e89

services/companion/java/com/android/server/companion/virtual/computercontrol/ComputerControlSessionImpl.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.server.companion.virtual.computercontrol;



import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;

import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -81,8 +85,7 @@ final class ComputerControlSessionImpl extends IComputerControlSession.Stub 
        mOnClosedListener = onClosedListener;

        VirtualDeviceParams virtualDeviceParams = new VirtualDeviceParams.Builder()

                .setName(mParams.getName())

                .setDevicePolicy(VirtualDeviceParams.POLICY_TYPE_RECENTS,

                        VirtualDeviceParams.DEVICE_POLICY_CUSTOM)

                .setDevicePolicy(POLICY_TYPE_RECENTS, DEVICE_POLICY_CUSTOM)

                .build();

        String permissionControllerPackage = packageManager.getPermissionControllerPackageName();

        ActivityPolicyExemption permissionController =
@@ -207,6 +210,7 @@ final class ComputerControlSessionImpl extends IComputerControlSession.Stub 


    @Override

    public void close() throws RemoteException {

        mVirtualDevice.setDevicePolicy(POLICY_TYPE_RECENTS, DEVICE_POLICY_DEFAULT);

        mVirtualDevice.close();

        mAppToken.unlinkToDeath(this, 0);

        mOnClosedListener.onClosed(asBinder());

services/tests/servicestests/src/com/android/server/companion/virtual/computercontrol/ComputerControlSessionTest.java

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.server.companion.virtual.computercontrol;



import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;

import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;



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



import static org.mockito.ArgumentMatchers.any;
@@ -119,6 +123,9 @@ public class ComputerControlSessionTest { 
                eq(mAppToken), any(), mVirtualDeviceParamsArgumentCaptor.capture(), any());

        assertThat(mVirtualDeviceParamsArgumentCaptor.getValue().getName())

                .isEqualTo(mParams.getName());

        assertThat(mVirtualDeviceParamsArgumentCaptor.getValue()

                .getDevicePolicy(POLICY_TYPE_RECENTS))

                .isEqualTo(DEVICE_POLICY_CUSTOM);



        verify(mVirtualDevice).addActivityPolicyExemption(

                mActivityPolicyExemptionArgumentCaptor.capture());
@@ -167,6 +174,7 @@ public class ComputerControlSessionTest { 
    @Test

    public void closeSession_closesVirtualDevice() throws Exception {

        mSession.close();

        verify(mVirtualDevice).setDevicePolicy(POLICY_TYPE_RECENTS, DEVICE_POLICY_DEFAULT);

        verify(mVirtualDevice).close();

        verify(mOnClosedListener).onClosed(mSession.asBinder());

    }