diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-02-25 18:24:57 -0800 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2016-02-25 18:31:56 -0800 |
commit | 3c048b9a2f1f8ddb58e08ffbc582fbef3d77d3b4 (patch) | |
tree | 42798aa8635c2fe8ee301b00db96f3c4f72d8087 | |
parent | 450a605729a2d45710e988e5ff4855eb36137e8f (diff) |
Disabling Dialer ringing feature
+ Need to remove for DP1
Bug=27367182
Bug=27353237
Change-Id: If370c942534bba3fd98c11447e1a83a2bf0cdfe1
-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 38b37a263..29d3d9de3 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 = true; + private static final boolean IS_DIALER_RINGING_ENABLED = false; private Boolean mIsDialerRingingEnabledForTesting; private final InCallTonePlayer mInCallTonePlayer; |