Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev

Author: Amith Yamasani

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

@@ -771,8 +771,8 @@ public void onDismiss(DialogInterface dialog) {
             });
 
             mBrightnessDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
-            mBrightnessDialog.getWindow().addFlags(
-                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS);
+            mBrightnessDialog.getWindow().getAttributes().privateFlags |=
+                    WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
             mBrightnessDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
         }
         if (!mBrightnessDialog.isShowing()) {