diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-23 20:03:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-23 20:03:28 +0000 |
commit | 602563008ae1c0acc873fd183ce298e199949677 (patch) | |
tree | 4c8800807d19285806ab0bad55c8b788f1691e25 /java/com/android/dialer/compat/telephony | |
parent | 5feae4d9f7b3685be38b48c1806ceb03c6b2273c (diff) | |
parent | bf7e8854806ce55c7fd298940fca52d013a02e89 (diff) |
Merge changes I71e70d6f,I40955c6e,I70ed303b
* changes:
Bubble change when display size change.
Update Assisted Dialing references.
Pressing back button twice really quickly no longer crashes dialer.
Diffstat (limited to 'java/com/android/dialer/compat/telephony')
-rw-r--r-- | java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java index 92e256998..86f344f4e 100644 --- a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java +++ b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java @@ -65,8 +65,11 @@ public class TelephonyManagerCompat { public static final String ASSISTED_DIALING_EXTRAS = "android.telecom.extra.ASSISTED_DIALING_EXTRAS"; + public static final String EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO = + "android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO"; + /** Indicates the Connection/Call used assisted dialing. */ - public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200; + public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9; public static final String EXTRA_IS_REFRESH = BuildCompat.isAtLeastOMR1() ? "android.telephony.extra.IS_REFRESH" : "is_refresh"; @@ -75,7 +78,7 @@ public class TelephonyManagerCompat { * Indicates the call underwent Assisted Dialing; typically set as a feature available from the * CallLog. */ - public static final Integer FEATURES_ASSISTED_DIALING = 0x10; + public static final Integer FEATURES_ASSISTED_DIALING = 1 << 4; /** * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM |