Merge "Deprecate Context#createApplicationContext" into sc-dev

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java
index ba3fc1e55c54..3b11a19f9acc 100644
--- a/core/java/android/appwidget/AppWidgetHostView.java
+++ b/core/java/android/appwidget/AppWidgetHostView.java
@@ -37,6 +37,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.Parcelable;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Pair;
@@ -718,9 +719,10 @@ public class AppWidgetHostView extends FrameLayout {
     protected Context getRemoteContext() {
         try {
             // Return if cloned successfully, otherwise default
-            Context newContext = mContext.createApplicationContext(
-                    mInfo.providerInfo.applicationInfo,
-                    Context.CONTEXT_RESTRICTED);
+            final ApplicationInfo info = mInfo.providerInfo.applicationInfo;
+            Context newContext = mContext.createPackageContextAsUser(info.packageName,
+                    Context.CONTEXT_RESTRICTED,
+                    UserHandle.getUserHandleForUid(info.uid));
             if (mColorResources != null) {
                 mColorResources.apply(newContext);
             }