From b6ee41aa6d47730eb934077e914450f59ac9b5f0 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Thu, 2 Sep 2021 11:33:43 +0100
Subject: [PATCH] Make RemoteViewsContextWrapper take the user id of the
 application info.

This is important to ensure sub-contexts know the user id used to create
the current context, or when using a work profile, a new context will be
created each time.

Fix: 197761162
Test: Manually with hand-made app widget
Change-Id: Ifb4a6dad152acbd2b2853ba8bf5cf1e131d55394
---
 core/java/android/widget/RemoteViews.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 91fc5a56d9795..fe5eb085dc5c0 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -739,6 +739,16 @@ public class RemoteViews implements Parcelable, Filter {
             return mContextForResources.getPackageName();
         }
 
+        @Override
+        public UserHandle getUser() {
+            return mContextForResources.getUser();
+        }
+
+        @Override
+        public int getUserId() {
+            return mContextForResources.getUserId();
+        }
+
         @Override
         public boolean isRestricted() {
             // Override isRestricted and direct to resource's implementation. The isRestricted is