diff options
Diffstat (limited to 'java/com/android/dialer')
-rw-r--r-- | java/com/android/dialer/assisteddialing/ConcreteCreator.java | 4 | ||||
-rw-r--r-- | java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java index a3c96dbdc..c1ffbd396 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -23,6 +23,7 @@ import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; +import android.support.v4.os.BuildCompat; import android.support.v4.os.UserManagerCompat; import android.telephony.TelephonyManager; import com.android.dialer.common.LogUtil; @@ -102,7 +103,8 @@ public final class ConcreteCreator { } return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR - && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING) + && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING + && !BuildCompat.isAtLeastP()) && configProvider.getBoolean("assisted_dialing_enabled", false); } 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 |