1 files changed, 6 insertions, 4 deletions
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
index 3885d201d..f41532d61 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
@@ -25,11 +25,11 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
-import androidx.preference.SwitchPreference;
 import androidx.preference.TwoStatePreference;
 
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.tv.settings.R;
+import com.android.tv.settings.widget.SwitchWithSoundPreference;
 
 /**
  * Settings screen for managing "Display over other apps" permission
@@ -69,12 +69,14 @@ public class SystemAlertWindow extends ManageAppOp {
     @Override
     public Preference bindPreference(@NonNull Preference preference,
             ApplicationsState.AppEntry entry) {
-        final TwoStatePreference switchPref = (SwitchPreference) preference;
+        final TwoStatePreference switchPref = (SwitchWithSoundPreference) preference;
         switchPref.setTitle(entry.label);
         switchPref.setKey(entry.info.packageName);
         switchPref.setIcon(entry.icon);
         switchPref.setOnPreferenceChangeListener((pref, newValue) -> {
-            setSystemAlertWindowAccess(entry, (Boolean) newValue);
+            findEntriesUsingPackageName(entry.info.packageName)
+                    .forEach(packageEntry -> setSystemAlertWindowAccess(
+                            packageEntry, (Boolean) newValue));
             return true;
         });
 
@@ -87,7 +89,7 @@ public class SystemAlertWindow extends ManageAppOp {
     @NonNull
     @Override
     public Preference createAppPreference() {
-        return new SwitchPreference(getPreferenceManager().getContext());
+        return new SwitchWithSoundPreference(getPreferenceManager().getContext());
     }
 
     @NonNull