Temporarily stop getting user from call

This is being removed, due to unidentified crashed. Ensures the incall
test doesn't run on HSUM builds.

Bug: 408470449
Test: atest EnhancedConfirmationInCallTest
Flag: EXEMPT critical crash fix
Relnote: None
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:671bad75d3c80c9ac73b767b3e06f71c29ce8f86)
Merged-In: I38253e0cdae80fb9116e38926af81c642cbbd144
Change-Id: I38253e0cdae80fb9116e38926af81c642cbbd144

2 files changed, 7 insertions, 3 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;
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt
index 9a4908c79..c1fca6398 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Process
+import android.os.UserManager
 import android.permission.flags.Flags
 import android.platform.test.annotations.AppModeFull
 import android.platform.test.annotations.RequiresFlagsEnabled
@@ -68,9 +69,11 @@ class EnhancedConfirmationInCallTest {
     val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()
 
     @Before
-    fun assumeNotAutoOrTv() {
+    fun assumeNotAutoTvOrHsum() {
         Assume.assumeFalse(packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK))
         Assume.assumeFalse(packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE))
+        // TODO b/408470449: remove once call extras are fixed
+        Assume.assumeFalse(UserManager.isHeadlessSystemUserMode())
     }
 
     companion object {