Merge "Disabling Dialer ringing feature" into nyc-dev
am: 9cff658da2
* commit '9cff658da23dc80786650fb0203ae4566839f18d':
Disabling Dialer ringing feature
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ac5d042..cbe4e1b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -321,7 +321,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="true"/>
+ android:value="false"/>
<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 3803a3e..39844e5 100644
--- a/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java
+++ b/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java
@@ -39,7 +39,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 = true;
+ private static final boolean IS_DIALER_RINGING_ENABLED = false;
private Boolean mIsDialerRingingEnabledForTesting;
private final InCallTonePlayer mInCallTonePlayer;