From 0940808a7595dee897a8e2df189b894c592b8bd1 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 11 Apr 2016 14:51:36 +0000
Subject: [PATCH] Merge "Show volume safety warning for all users" am: 0a51955
 am: 6cd66de

* commit '6cd66defe33ef84580aff5ab067cd5308d258c01':
  Show volume safety warning for all users

Change-Id: Ic417e1591a1a7b7876b5a5e4f75153eb1992fe66
(cherry picked from commit 683bda7cb228c0576fbeebcca6df3cd3c9a8ca6c)

Bug: 24884692
---
 .../src/com/android/systemui/volume/SafetyWarningDialog.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
index 04640a2489b3f..d7c4bbf3ea1da 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/SafetyWarningDialog.java
@@ -47,6 +47,7 @@ abstract public class SafetyWarningDialog extends SystemUIDialog
         mAudioManager = audioManager;
 
         getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR);
+        setShowForAllUsers(true);
         setMessage(mContext.getString(com.android.internal.R.string.safe_media_volume_warning));
         setButton(DialogInterface.BUTTON_POSITIVE,
                 mContext.getString(com.android.internal.R.string.yes), this);