Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MediaProjection] Remove filtering for cross-tab sharing" into udc-dev am: 6d7f698983

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931516

Change-Id: Ie1f672b0571d0fac94b2e75734f2653c9c541ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yalan Yiue
2023-05-03 10:57:53 +00:00
committed by Automerger Merge Worker
parent ab0c5ecb8d 6d7f698983
commit ddd4dc581e
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt
View File

@@ -111,7 +111,7 @@ class MediaProjectionAppSelectorActivity(
if (featureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) { if (featureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) {
component.emptyStateProvider component.emptyStateProvider
} else { } else {
super.createBlockerEmptyStateProvider() object : EmptyStateProvider {}
} }
override fun createListController(userHandle: UserHandle): ResolverListController = override fun createListController(userHandle: UserHandle): ResolverListController =

9
packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorController.kt
View File

@@ -19,7 +19,6 @@ package com.android.systemui.mediaprojection.appselector
import android.content.ComponentName import android.content.ComponentName
import android.os.UserHandle import android.os.UserHandle
import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.FeatureFlags
import com.android.systemui.flags.Flags
import com.android.systemui.mediaprojection.appselector.data.RecentTask import com.android.systemui.mediaprojection.appselector.data.RecentTask
import com.android.systemui.mediaprojection.appselector.data.RecentTaskListProvider import com.android.systemui.mediaprojection.appselector.data.RecentTaskListProvider
import javax.inject.Inject import javax.inject.Inject
@@ -59,13 +58,7 @@ constructor(
* Removes all recent tasks that are different from the profile of the host app to avoid any * Removes all recent tasks that are different from the profile of the host app to avoid any
* cross-profile sharing * cross-profile sharing
*/ */
private fun List<RecentTask>.filterDevicePolicyRestrictedTasks(): List<RecentTask> = private fun List<RecentTask>.filterDevicePolicyRestrictedTasks(): List<RecentTask> = this
if (flags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) {
// TODO(b/263950746): filter tasks based on the enterprise policies
this
} else {
filter { UserHandle.of(it.userId) == hostUserHandle }
}
private fun List<RecentTask>.filterAppSelector(): List<RecentTask> = filter { private fun List<RecentTask>.filterAppSelector(): List<RecentTask> = filter {
// Only take tasks that is not the app selector // Only take tasks that is not the app selector

6
packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt
View File

@@ -132,7 +132,7 @@ class MediaProjectionAppSelectorControllerTest : SysuiTestCase() {
} }
@Test @Test
fun initRecentTasksWithAppSelectorTasks_enterprisePoliciesDisabled_bindsOnlyTasksWithHostProfile() { fun initRecentTasksWithAppSelectorTasks_enterprisePoliciesDisabled_bindsAllTasks() {
givenEnterprisePoliciesFeatureFlag(enabled = false) givenEnterprisePoliciesFeatureFlag(enabled = false)
val tasks = val tasks =
@@ -147,11 +147,15 @@ class MediaProjectionAppSelectorControllerTest : SysuiTestCase() {
controller.init() controller.init()
// TODO (b/263950746): Cross-profile filtering is removed for now. This should be brought
// back with the future fix
verify(view) verify(view)
.bind( .bind(
listOf( listOf(
createRecentTask(taskId = 1, userId = hostUserHandle.identifier), createRecentTask(taskId = 1, userId = hostUserHandle.identifier),
createRecentTask(taskId = 2, userId = otherUserHandle.identifier),
createRecentTask(taskId = 3, userId = hostUserHandle.identifier), createRecentTask(taskId = 3, userId = hostUserHandle.identifier),
createRecentTask(taskId = 4, userId = otherUserHandle.identifier),
createRecentTask(taskId = 5, userId = hostUserHandle.identifier), createRecentTask(taskId = 5, userId = hostUserHandle.identifier),
) )
) )