From afae0bfe127ef59cee7b746b9a3d96731b025e83 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanxinchen@google.com>
Date: Mon, 25 Apr 2022 16:43:59 -0700
Subject: [PATCH] No need to show user consent for SingleDevice && isSkipPrompt

Test: atest CtsCompanionDeviceManagerCoreTestCases
      atest CtsCompanionDeviceManagerUiAutomationTestCases
      atest CtsOsTestCases:CompanionDeviceManagerTest
Fix: 230393501
Change-Id: I29dd4c07b69021c87fb044a385aadb85334cdea2
---
 .../companiondevicemanager/CompanionDeviceActivity.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
index 37cbf3017f0b2..5e918641e49fb 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
@@ -484,6 +484,14 @@ public class CompanionDeviceActivity extends FragmentActivity implements
         if (deviceFilterPairs.isEmpty()) return;
 
         mSelectedDevice = requireNonNull(deviceFilterPairs.get(0));
+        // No need to show user consent dialog if it is a singleDevice
+        // and isSkipPrompt(true) AssociationRequest.
+        // See AssociationRequestsProcessor#mayAssociateWithoutPrompt.
+        if (mRequest.isSkipPrompt()) {
+            mSingleDeviceSpinner.setVisibility(View.GONE);
+            onUserSelectedDevice(mSelectedDevice);
+            return;
+        }
 
         final String deviceName = mSelectedDevice.getDisplayName();
         final Spanned title = getHtmlFromResources(