commit aa63f2422dc75d20041dfcf754201a5a48571aa2
author Yorke Lee <yorkelee@google.com> Fri Aug 01 21:58:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 01 08:29:25 2014 +0000
tree 0141fea915fde6305bcf32d677a5fa44e021b97e
parent 82c8a46052629d1450320c116d14c7353bfe4ea1
parent c30f00c6003fc9b53ad3861d2528f63ff67a7f65

Merge "Make error dialog in emergency dialog show up" into lmp-dev

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 8d4521f..e84805f 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -616,6 +616,7 @@
 
             // blur stuff behind the dialog
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
+            dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
         }
         return dialog;
     }