commit 1810bfbdc306dd33153d351b962589fdc38bbdf3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 10 21:49:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 10 21:49:06 2017 +0000
tree 514079e0f9a8e1063d0371392243af402a839190
parent 638f180c1a3ee75549d14e41630ab05e96d709f0
parent ebfc91628b69167d75e8658f3e727b036036aef3

Merge "Add getSelfManagedPhoneAccounts TelecomManager API."

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();