diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-03 00:36:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-03 00:36:39 +0000 |
commit | 8b1491d22c4dc8226e192a9997b5200ca517c1c1 (patch) | |
tree | 4008e50d81df0c20c2791f6d414775e65af62f13 /java/com/android/incallui | |
parent | ed022b519350fad09509252d52cce71b18ff4c0c (diff) | |
parent | d2e5d0be467cf8b200feeab73691e08d02f7da2e (diff) |
Merge "Move assisted dialing out of P."
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index 50bc691b7..d36b00d91 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -1136,7 +1136,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa */ public boolean isAssistedDialed() { if (getIntentExtras() != null) { - // O_MR1 and below uses the existence of USE_ASSISTED_DIALING to indicate assisted dialing + // P and below uses the existence of USE_ASSISTED_DIALING to indicate assisted dialing // was used. The Dialer client is responsible for performing assisted dialing before // placing the outgoing call. // @@ -1148,13 +1148,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa } } - // Starting in P+ USE_ASSISTED_DIALING indicates that the client requested the platform - // perform assisted dialing. PROPERTY_ASSISTED_DIALING_USED indicates assisted dialing took - // place. - if (hasProperty(TelephonyManagerCompat.PROPERTY_ASSISTED_DIALING_USED) - && BuildCompat.isAtLeastP()) { - return true; - } return false; } @@ -1164,21 +1157,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa return null; } - if (BuildCompat.isAtLeastP()) { - if (getExtras() == null) { - return null; - } - - if (getExtras() - .getParcelable(TelephonyManagerCompat.EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO) - == null) { - return null; - } - - // TODO(erfanian): Use the framework transformation info when we can link against it - return null; - } - if (getIntentExtras().getBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS) == null) { return null; } |