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

Commit 6089fc60 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up old VDM display flags" into main

parents e28f5b84 2a1f2f1d

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ package android.companion.virtual { 
    method public int getAudioRecordingSessionId(int);

    method public int getDeviceIdForDisplayId(int);

    method public int getDevicePolicy(int, int);

    method @FlaggedApi("android.companion.virtual.flags.interactive_screen_mirror") public boolean isVirtualDeviceOwnedMirrorDisplay(int);

    method public boolean isVirtualDeviceOwnedMirrorDisplay(int);

    method public void playSoundEffect(int, int);

  }

core/java/android/companion/virtual/VirtualDeviceManager.java

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_INTERACTIVE_SCREEN_MIRROR)

    @TestApi

    public boolean isVirtualDeviceOwnedMirrorDisplay(int displayId) {

        if (mService == null) {

core/java/android/companion/virtual/flags.aconfig

+0 −15
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ flag { 
  bug: "306622082"

}



flag {

  name: "consistent_display_flags"

  namespace: "virtual_devices"

  description: "Make virtual display flags consistent with display manager"

  bug: "300905478"

}



flag {

  name: "vdm_custom_ime"

  is_exported: true
@@ -88,14 +81,6 @@ flag { 
  bug: "295258915"

}



flag {

  name: "interactive_screen_mirror"

  is_exported: true

  namespace: "virtual_devices"

  description: "Enable interactive screen mirroring using Virtual Devices"

  bug: "292212199"

}



flag {

  name: "virtual_stylus"

  is_exported: true

packages/SystemUI/src/com/android/systemui/display/domain/interactor/ConnectedDisplayInteractor.kt

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.display.domain.interactor



import android.companion.virtual.VirtualDeviceManager

import android.companion.virtual.flags.Flags

import android.view.Display

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background
@@ -155,8 +154,7 @@ constructor( 
    }



    private fun isVirtualDeviceOwnedMirrorDisplay(display: Display): Boolean {

        return Flags.interactiveScreenMirror() &&

            virtualDeviceManager != null &&

        return virtualDeviceManager != null &&

            virtualDeviceManager.isVirtualDeviceOwnedMirrorDisplay(display.displayId)

    }

}

packages/SystemUI/tests/src/com/android/systemui/display/domain/interactor/ConnectedDisplayInteractorTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.systemui.display.domain.interactor



import android.companion.virtual.VirtualDeviceManager

import android.companion.virtual.flags.Flags.FLAG_INTERACTIVE_SCREEN_MIRROR

import android.platform.test.annotations.EnableFlags

import android.testing.TestableLooper

import android.view.Display

import android.view.Display.TYPE_EXTERNAL
@@ -160,7 +158,6 @@ class ConnectedDisplayInteractorTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(FLAG_INTERACTIVE_SCREEN_MIRROR)

    fun displayState_virtualDeviceOwnedMirrorVirtualDisplay_connected() =

        testScope.runTest {

            whenever(virtualDeviceManager.isVirtualDeviceOwnedMirrorDisplay(anyInt()))
@@ -183,7 +180,6 @@ class ConnectedDisplayInteractorTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(FLAG_INTERACTIVE_SCREEN_MIRROR)

    fun virtualDeviceOwnedMirrorVirtualDisplay_emitsConnectedDisplayAddition() =

        testScope.runTest {

            whenever(virtualDeviceManager.isVirtualDeviceOwnedMirrorDisplay(anyInt()))