From 444f96a9ed5087c4ebc8ce7b43aa05483315c2b6 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Mon, 11 Jan 2021 10:00:12 -0800
Subject: [PATCH] Fix CDM associate command

Fixes: 175952313
Test: atest android.os.cts.CompanionDeviceManagerTest#testDump
Change-Id: I03bb4cc82636dc60a447e20b40c5f46f1a7864ad
---
 .../server/companion/CompanionDeviceManagerService.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 8a27acce03c35..9d028358561ff 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -919,9 +919,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
                     break;
 
                     case "associate": {
+                        int userId = getNextArgInt();
                         String pkg = getNextArgRequired();
                         String address = getNextArgRequired();
-                        addAssociation(new Association(getNextArgInt(), address, pkg, null, false));
+                        addAssociation(new Association(userId, address, pkg, null, false));
                     }
                     break;