commit 6ae7906a83c666d3a9e0c69a06fa1a867ad7b41e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 30 23:10:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 30 23:10:28 2018 +0000
tree e24edfbea09ca973e67660684073b38a7d43eeed
parent b5cd1dad2e1913b34d58bd914a93bd13da017428
parent 9e8ba380e2524ba85291ebb40081093f63cdd2e9

Merge "Enforce read privileged phone state on  get{Voice/Data}ActivationState"

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index f2cf039..31e1958 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -536,13 +536,6 @@
     @Override
     public void onPause() {
         super.onPause();
-
-        synchronized (mToneGeneratorLock) {
-            if (mToneGenerator != null) {
-                mToneGenerator.release();
-                mToneGenerator = null;
-            }
-        }
     }
 
     @Override
@@ -676,7 +669,7 @@
 
             // blur stuff behind the dialog
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
-            dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            setShowWhenLocked(true);
         }
         return dialog;
     }