diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-02-16 23:14:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-16 23:14:05 +0000 |
| commit | 7a95f24a60fea68400b12f97d19ed0ac6df88990 (patch) | |
| tree | 49995111e1782d8f892675c3d5c64258f051d619 /InCallUI | |
| parent | 5974e8856b5317756edccf43b7f8407d5e09d68a (diff) | |
| parent | d557bc2ba817a071005e18f006f7e80eacc506c8 (diff) | |
Enabling Dialer to play ringtones am: 9172c905b3
am: d557bc2ba8
* commit 'd557bc2ba817a071005e18f006f7e80eacc506c8':
Enabling Dialer to play ringtones
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); |