diff options
| author | 2023-04-28 14:21:55 +0000 | |
|---|---|---|
| committer | 2023-05-02 13:56:21 +0000 | |
| commit | 57dfaed78717a40d88435d3d3b2ec4c7608ccdad (patch) | |
| tree | b6ebac5b45c636f974ba755a00409e702691e6e5 | |
| parent | 5ee04a8a1cfb4d869bbb1db9479b57fb0b4d697d (diff) | |
[MediaProjection] Remove filtering for cross-tab sharing
Temporarily disable cross tabs filtering for dogfood
https://screenshot.googleplex.com/7xQnsAKGy3nc2Ww.png
Fixes: 279595820
Test: initRecentTasksWithAppSelectorTasks_enterprisePoliciesDisabled_bindsAllTasks
Change-Id: I6398e8e15cd58474a118ad19630ab0f798ba5603
3 files changed, 7 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt index 0860c207ef20..c75ff8ea405e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt @@ -111,7 +111,7 @@ class MediaProjectionAppSelectorActivity( if (featureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES)) { component.emptyStateProvider } else { - super.createBlockerEmptyStateProvider() + object : EmptyStateProvider {} } override fun createListController(userHandle: UserHandle): ResolverListController = diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorController.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorController.kt index 219629b44c5d..1d8fe729494d 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorController.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorController.kt @@ -19,7 +19,6 @@ package com.android.systemui.mediaprojection.appselector import android.content.ComponentName import android.os.UserHandle 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.RecentTaskListProvider 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 * cross-profile sharing */ - private fun List<RecentTask>.filterDevicePolicyRestrictedTasks(): List<RecentTask> = - 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>.filterDevicePolicyRestrictedTasks(): List<RecentTask> = this private fun List<RecentTask>.filterAppSelector(): List<RecentTask> = filter { // Only take tasks that is not the app selector diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt index 497777545c70..f1bbd8434b40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt @@ -132,7 +132,7 @@ class MediaProjectionAppSelectorControllerTest : SysuiTestCase() { } @Test - fun initRecentTasksWithAppSelectorTasks_enterprisePoliciesDisabled_bindsOnlyTasksWithHostProfile() { + fun initRecentTasksWithAppSelectorTasks_enterprisePoliciesDisabled_bindsAllTasks() { givenEnterprisePoliciesFeatureFlag(enabled = false) val tasks = @@ -147,11 +147,15 @@ class MediaProjectionAppSelectorControllerTest : SysuiTestCase() { controller.init() + // TODO (b/263950746): Cross-profile filtering is removed for now. This should be brought + // back with the future fix verify(view) .bind( listOf( createRecentTask(taskId = 1, userId = hostUserHandle.identifier), + createRecentTask(taskId = 2, userId = otherUserHandle.identifier), createRecentTask(taskId = 3, userId = hostUserHandle.identifier), + createRecentTask(taskId = 4, userId = otherUserHandle.identifier), createRecentTask(taskId = 5, userId = hostUserHandle.identifier), ) ) |