diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-02-16 22:59:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-16 22:59:12 +0000 |
| commit | d557bc2ba817a071005e18f006f7e80eacc506c8 (patch) | |
| tree | fc593d5f9ce3f481be5427e0b387241ec7660b36 | |
| parent | 496785594e70f0ad92a84faaaac5b5fc9d5427af (diff) | |
| parent | 9172c905b311816eba1d24659f02facfab95b0b3 (diff) | |
Enabling Dialer to play ringtones
am: 9172c905b3
* commit '9172c905b311816eba1d24659f02facfab95b0b3':
Enabling Dialer to play ringtones
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e7c17cb2a..c04885412 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -317,7 +317,7 @@ android:encryptionAware="true" > <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" /> <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING" - android:value="false"/> + android:value="true"/> <intent-filter> <action android:name="android.telecom.InCallService"/> </intent-filter> 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); |