From 8a1346ce7aa21c8294a0eb8214fdf55149afa246 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Thu, 21 Mar 2024 22:12:07 +0000
Subject: [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip
 prompt by setSkipPrompt

Fix: 329230490

Change-Id: I6e4dd33cbf98293d7efa0a40c0668d6c5242059a
Test: CTS
---
 .../com/android/server/companion/CompanionDeviceManagerService.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index ff8881ba1852..6be6902ac327 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -430,10 +430,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
             mCallingPackage = callingPackage;
             request.setCallingPackage(callingPackage);
 
-            if (mayAssociateWithoutPrompt(callingPackage, userId)) {
-                Slog.i(LOG_TAG, "setSkipPrompt(true)");
-                request.setSkipPrompt(true);
-            }
+            request.setSkipPrompt(mayAssociateWithoutPrompt(callingPackage, userId));
+
             callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);
 
             AndroidFuture<String> fetchProfileDescription =
-- 
cgit v1.2.3-59-g8ed1b