diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-02-16 12:52:34 -0800 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2016-02-16 14:19:13 -0800 |
commit | 9172c905b311816eba1d24659f02facfab95b0b3 (patch) | |
tree | 242f0082388500dbceb10c27701ae7c3048680b9 /InCallUI | |
parent | 32b1629804f29958966f7711a90c5e507c2049c2 (diff) |
Enabling Dialer to play ringtones
+ The code to make the Dialer play was disabled behind flags, this
change flips the flags so the Dialer is responsible for playing the
ringtone.
+ The in-code flag will be removed later after a QA pass of the
feature.
- Removed TODO to respect Do Not Disturb, see b/26936902
Bug=18702990
Change-Id: I773c1c614beb61a6763daccd2903d9d341cf4dc0
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java | 2 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java b/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java index 29d3d9de3..38b37a263 100644 --- a/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java +++ b/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java @@ -37,7 +37,7 @@ public class DialerRingtoneManager { * Flag used to determine if the Dialer is responsible for playing ringtones for incoming calls. * Once we're ready to enable Dialer Ringing, these flags should be removed. */ - private static final boolean IS_DIALER_RINGING_ENABLED = false; + private static final boolean IS_DIALER_RINGING_ENABLED = true; private Boolean mIsDialerRingingEnabledForTesting; private final InCallTonePlayer mInCallTonePlayer; diff --git a/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java b/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java index be7fffbcb..6ef4e259a 100644 --- a/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java +++ b/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java @@ -118,7 +118,6 @@ public class InCallTonePlayer { } private void playOnBackgroundThread(ToneGeneratorInfo info) { - // TODO (maxwelb): b/26936902 respect Do Not Disturb setting ToneGenerator toneGenerator = null; try { Log.v(this, "Starting tone " + info); |