From 6c81629fcb7da6a763441589233f25803f0637c3 Mon Sep 17 00:00:00 2001
From: Sergey Nikolaienkov <sergeynv@google.com>
Date: Wed, 22 Dec 2021 14:18:34 +0100
Subject: [PATCH] Remove duplicated setCompanionAppUids() line in CdmService

Bug: 171305836
Test: atest CtsCompanionDeviceManagerCoreTestCases
Change-Id: Iaee574b184492eb03c9652f4ad9d7ae221dfc556
---
 .../server/companion/CompanionDeviceManagerService.java      | 5 +----
 1 file changed, 1 insertion(+), 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 626128aeba2a4..9b370dc1f12eb 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -973,11 +973,8 @@ public class CompanionDeviceManagerService extends SystemService {
                 companionAppUids.add(uid);
             }
         }
-        if (mAtmInternal != null) {
-            mAtmInternal.setCompanionAppUids(userId, companionAppUids);
-        }
         if (mAmInternal != null) {
-            // Make a copy of companionAppUids and send it to ActivityManager.
+            // Make a copy of the set and send it to ActivityManager.
             mAmInternal.setCompanionAppUids(userId, new ArraySet<>(companionAppUids));
         }
     }