diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-02-26 02:36:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-26 02:36:03 +0000 |
| commit | 2e8f566867541e1559a82b9f9e23d99e32cdadf8 (patch) | |
| tree | 520d6b4695b565ff05a8e8c64fecc0e2ef291427 | |
| parent | 5ec71527e2d6ed4c24e21a99ac7e820df68b7362 (diff) | |
| parent | 9cff658da23dc80786650fb0203ae4566839f18d (diff) | |
Merge "Disabling Dialer ringing feature" into nyc-dev
am: 9cff658da2
* commit '9cff658da23dc80786650fb0203ae4566839f18d':
Disabling Dialer ringing feature
| -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; |