diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-02-26 02:33:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-26 02:33:40 +0000 |
| commit | 9cff658da23dc80786650fb0203ae4566839f18d (patch) | |
| tree | dce38a148189e2481545f8b1eaed7c3a0dd3a274 | |
| parent | 0eeee8b2e0d307f5be3c733dad5ef150fd2e008e (diff) | |
| parent | 3c048b9a2f1f8ddb58e08ffbc582fbef3d77d3b4 (diff) | |
Merge "Disabling Dialer ringing feature" into nyc-dev
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ac5d042ac..cbe4e1b0b 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 3803a3e9a..39844e5a2 100644 --- a/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java +++ b/InCallUI/src/com/android/incallui/ringtone/DialerRingtoneManager.java @@ -39,7 +39,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 = true; + private static final boolean IS_DIALER_RINGING_ENABLED = false; private Boolean mIsDialerRingingEnabledForTesting; private final InCallTonePlayer mInCallTonePlayer; |