Merge cherrypicks of ['googleplex-android-review.googlesource.com/32899264', 'googleplex-android-review.googlesource.com/32978037'] into 25Q2-release.

Change-Id: I27fd5fe92e075c77e758a25de09f80e8670c404f

1 files changed, 3 insertions, 2 deletions

diff --git a/service/java/com/android/ecm/EnhancedConfirmationService.java b/service/java/com/android/ecm/EnhancedConfirmationService.java
index 1cc3a743e..64b5724a2 100644
--- a/service/java/com/android/ecm/EnhancedConfirmationService.java
+++ b/service/java/com/android/ecm/EnhancedConfirmationService.java
@@ -37,7 +37,6 @@ import android.app.ecm.IEnhancedConfirmationManager;
 import android.app.role.RoleManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.InstallSourceInfo;
 import android.content.pm.PackageInstaller;
@@ -48,7 +47,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.os.SystemConfigManager;
@@ -691,10 +689,13 @@ public class EnhancedConfirmationService extends SystemService {
                 // telephony service is unavailable.
             }
             UserHandle user = mContext.getUser();
+            /*
+            TODO b/408470449: reenable once call extras are fixed
             Bundle extras = call.getDetails().getExtras();
             if (extras != null) {
                 user = extras.getParcelable(Intent.EXTRA_USER_HANDLE, UserHandle.class);
             }
+             */
             if (number != null) {
                 return hasContactWithPhoneNumber(number, user)
                         ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED;