From 4875662f488618d2ffa73fd658e04ab9f7716386 Mon Sep 17 00:00:00 2001
From: Manish Singh <psych@google.com>
Date: Wed, 24 Apr 2024 13:32:14 +0000
Subject: [PATCH] Apply personal filter when private tab not shown

Bug: 336327005
Fix: 337744275
Test: manual
Change-Id: I1c8cbc35f90cd39bb332f9a6b787473779249166
---
 .../applications/manageapplications/ManageApplications.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index b392d9a6b2d..6c16d94a51d 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -667,7 +667,11 @@ public class ManageApplications extends InstrumentedFragment
             compositeFilter =
                     new CompoundFilter(compositeFilter, ApplicationsState.FILTER_PRIVATE_PROFILE);
         }
-        if (mIsPersonalOnly) {
+
+        // We might not be showing the private tab even when there's a private profile present and
+        // there's only personal profile info to show, in which case we should still apply the
+        // personal filter.
+        if (mIsPersonalOnly || !(mIsWorkOnly || mIsPrivateProfileOnly)) {
             compositeFilter = new CompoundFilter(compositeFilter,
                     ApplicationsState.FILTER_PERSONAL);
         }