commit 638f180c1a3ee75549d14e41630ab05e96d709f0
author Tyler Gunn <tgunn@google.com> Mon Apr 03 15:49:48 2017 -0700
committer Tyler Gunn <tgunn@google.com> Mon Apr 10 13:35:46 2017 -0700
tree 256bb31efe54aefc94c45b28dfa04468bdb9241e
parent e42440cca9f3eaa3d3d13e3e8df5016c8d511e44

Fix issue where self-managed calls play ringtone.

If the default dialer doesn't handle ringtones, selfmanaged calls will
play the system ringtone.

Test: Manual
Bug: 36866764
Change-Id: I5392333005d30b422aadb37e2a7578597fcd9760

src/com/android/server/telecom/Ringer.java

diff --git a/src/com/android/server/telecom/Ringer.java b/src/com/android/server/telecom/Ringer.java
index c6056fa..c5817e7 100644
--- a/src/com/android/server/telecom/Ringer.java
+++ b/src/com/android/server/telecom/Ringer.java
@@ -116,6 +116,11 @@
             return isRingerAudible;
         }
 
+        if (foregroundCall.isSelfManaged()) {
+            Log.addEvent(foregroundCall, LogUtils.Events.SKIP_RINGING, "Self-managed");
+            return false;
+        }
+
         stopCallWaiting();
 
         if (!shouldRingForContact(foregroundCall.getContactUri())) {
@@ -161,6 +166,11 @@
             return;
         }
 
+        if (call.isSelfManaged()) {
+            Log.addEvent(call, LogUtils.Events.SKIP_RINGING, "Self-managed");
+            return;
+        }
+
         Log.v(this, "Playing call-waiting tone.");
 
         stopRinging();