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

Commit 976c8a27 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Always show ComputerControl tasks in recents 

Bug: 440355882
Flag: android.companion.virtualdevice.flags.computer_control_access
Test: presubmit & manual
Change-Id: I603392a542a22eb3a9c793db2df385b7445294d0
parent 9acb8f9b

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

+0 −4
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
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_ACTIVITY;

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



import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -118,7 +116,6 @@ final class ComputerControlSessionImpl extends IComputerControlSession.Stub 


        final VirtualDeviceParams virtualDeviceParams = new VirtualDeviceParams.Builder()

                .setName(mParams.getName())

                .setDevicePolicy(POLICY_TYPE_RECENTS, DEVICE_POLICY_CUSTOM)

                .build();



        int displayFlags = DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED
@@ -311,7 +308,6 @@ 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

+1 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class ComputerControlSessionTest { 
                .isEqualTo(mDefaultParams.getName());

        assertThat(mVirtualDeviceParamsArgumentCaptor.getValue()

                .getDevicePolicy(POLICY_TYPE_RECENTS))

                .isEqualTo(DEVICE_POLICY_CUSTOM);

                .isEqualTo(DEVICE_POLICY_DEFAULT);



        verify(mVirtualDevice).createVirtualDisplay(

                mVirtualDisplayConfigArgumentCaptor.capture(), any());
@@ -303,7 +303,6 @@ public class ComputerControlSessionTest { 
    public void closeSession_closesVirtualDevice() throws Exception {

        createComputerControlSession(mDefaultParams);

        mSession.close();

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

        verify(mVirtualDevice).close();

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

    }