Enabling Dialer to play ringtones am: 9172c905b3
am: d557bc2ba8
* commit 'd557bc2ba817a071005e18f006f7e80eacc506c8':
Enabling Dialer to play ringtones
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e7c17cb..c048854 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 29d3d9d..38b37a2 100644
--- a/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java
+++ b/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java
@@ -37,7 +37,7 @@
* 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 be7fffb..6ef4e25 100644
--- a/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java
+++ b/InCallUI/src/com/android/incallui/ringtone/InCallTonePlayer.java
@@ -118,7 +118,6 @@
}
private void playOnBackgroundThread(ToneGeneratorInfo info) {
- // TODO (maxwelb): b/26936902 respect Do Not Disturb setting
ToneGenerator toneGenerator = null;
try {
Log.v(this, "Starting tone " + info);