From cd8573f3e1c82d85e28435799537ecbc26352276 Mon Sep 17 00:00:00 2001
From: hoffc <quic_hoffc@quicinc.com>
Date: Thu, 13 Feb 2025 07:37:33 -0800
Subject: [PATCH] Fix private volume UI items incorrectly displayed for public
 volume

The loading of private volume UI items is async, these private volume UI items should not be displayed if user has switched to public volume.

Limit private volume UI items only visible for private volume.

Bug: 396043608
(cherry picked from https://android-review.googlesource.com/q/commit:1bfb959c1f14226231145a24624731650278af3a)
Merged-In: I5ea5cfb5d73f74cae33d780ed1f7f04fba870e32
Change-Id: I5ea5cfb5d73f74cae33d780ed1f7f04fba870e32
Flag: EXEMPT bug fix
---
 .../deviceinfo/storage/StorageItemPreferenceController.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index c0caff7a494..cb8e6fc03b0 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -475,7 +475,10 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
             updatePrivateStorageCategoryPreferencesOrder();
             mIsPreferenceOrderedBySize = true;
         }
-        setPrivateStorageCategoryPreferencesVisibility(true);
+
+        if (isValidPrivateVolume()) {
+            setPrivateStorageCategoryPreferencesVisibility(true);
+        }
     }
 
     private StorageCacheHelper.StorageCache getSizeInfo(