auto import from //depot/cupcake/@137055
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 0feb1da..8814e48 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -505,9 +505,12 @@
             if (mMediaStorageNotification == null) {
                 mMediaStorageNotification = new Notification();
                 mMediaStorageNotification.when = 0;
-                if (mPlaySounds) {
-                    mMediaStorageNotification.defaults |= Notification.DEFAULT_SOUND;
-                }
+            }
+
+            if (mPlaySounds) {
+                mMediaStorageNotification.defaults |= Notification.DEFAULT_SOUND;
+            } else {
+                mMediaStorageNotification.defaults &= ~Notification.DEFAULT_SOUND;
             }
 
             if (dismissable) {