1 files changed, 17 insertions, 1 deletions
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 27243225b..a30367f7f 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -1114,7 +1114,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
     // perform assisted dialing. PROPERTY_ASSISTED_DIALING_USED indicates assisted dialing took
     // place.
     if (hasProperty(TelephonyManagerCompat.PROPERTY_ASSISTED_DIALING_USED)
-        && Build.VERSION.SDK_INT > ConcreteCreator.BUILD_CODE_CEILING) {
+        && BuildCompat.isAtLeastP()) {
       return true;
     }
     return false;
@@ -1126,10 +1126,26 @@ 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;
     }
 
+    // Used in N-OMR1
     return TransformationInfo.newInstanceFromBundle(
         getIntentExtras().getBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS));
   }