From cb5a80ea57b51fcde117dea253c546dbba9f27f1 Mon Sep 17 00:00:00 2001
From: Paul Hobbs <phobbs@google.com>
Date: Tue, 29 Jun 2021 19:54:32 +0000
Subject: Revert^2 "Deprecate Context#createApplicationContext"

Bug: 192242649

5a41b45a85286200f029b6ac06d004cb32c88dd0

Change-Id: Idcebd68e0079e7e87de04ae25069b3a9ff72093c
---
 core/java/android/widget/RemoteViews.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/java/android/widget/RemoteViews.java')

diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index e827f0a31bfd..8a044fd06dd5 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -5831,8 +5831,9 @@ public class RemoteViews implements Parcelable, Filter {
                 return context;
             }
             try {
-                return context.createApplicationContext(mApplication,
-                        Context.CONTEXT_RESTRICTED);
+                return context.createPackageContextAsUser(mApplication.packageName,
+                        Context.CONTEXT_RESTRICTED,
+                        UserHandle.getUserHandleForUid(mApplication.uid));
             } catch (NameNotFoundException e) {
                 Log.e(LOG_TAG, "Package name " + mApplication.packageName + " not found");
             }
-- 
cgit v1.2.3