From ba987ca94fdec3a1ada76756b6ac77a1584c9051 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Mon, 1 Mar 2021 19:23:10 -0800 Subject: [PATCH] Override isRestricted for preventing unexpected resource loading Bug: 179461812 Test: atest FontResourceTest Change-Id: Ifb731310d31b80522bc82052625716083cac9e6f (cherry picked from commit 0de34e9d87aaed7ed5e0e74f2d6668e886579ff9) --- core/java/android/widget/RemoteViews.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 7016c5cf0de6f..a9b2c4df255f1 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -593,6 +593,14 @@ public class RemoteViews implements Parcelable, Filter { public String getPackageName() { return mContextForResources.getPackageName(); } + + @Override + public boolean isRestricted() { + // Override isRestricted and direct to resource's implementation. The isRestricted is + // used for determining the risky resources loading, e.g. fonts, thus direct to context + // for resource. + return mContextForResources.isRestricted(); + } } private class SetEmptyView extends Action {