From 0308a9659bdcf9308f568ebebb3498215b9e656f Mon Sep 17 00:00:00 2001
From: Elis Elliott <eliselliott@google.com>
Date: Wed, 26 Jan 2022 17:54:24 +0000
Subject: [PATCH] Add EXTRA_USER when sending broadcasts used by managed
 provisioning.

Add EXTRA_USER when sending ACTION_USER_UNLOCKED and
when sending ACTION_PROVISIONING_COMPLETED

Bug: 212679631

Test: atest CtsDevicePolicyTestCases:DevicPolicyManagerTest
Test: atest FrameworkServicesTest:UserControllerTest
Change-Id: Id1a6d44f450979979edf7218d0f4c7177cf77932
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index e0b627343e2df..7040831134317 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -10840,6 +10840,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
             int user, String action, boolean leaveAllSystemAppsEnabled) {
         final Intent intent = new Intent(DevicePolicyManager.ACTION_PROVISIONING_COMPLETED)
                 .putExtra(Intent.EXTRA_USER_HANDLE, user)
+                .putExtra(Intent.EXTRA_USER, UserHandle.of(user))
                 .putExtra(
                         DevicePolicyManager.EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED,
                         leaveAllSystemAppsEnabled)