summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/appwidget/flags.aconfig10
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java5
2 files changed, 1 insertions, 14 deletions
diff --git a/core/java/android/appwidget/flags.aconfig b/core/java/android/appwidget/flags.aconfig
index 9914ba2b020a..58bf4ef8100b 100644
--- a/core/java/android/appwidget/flags.aconfig
+++ b/core/java/android/appwidget/flags.aconfig
@@ -97,16 +97,6 @@ flag {
}
flag {
- name: "check_remote_views_uri_permission"
- namespace: "app_widgets"
- description: "Check that the widget provider has permissions to access any URIs within its RemoteViews"
- bug: "369137473"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
name: "engagement_metrics"
namespace: "app_widgets"
description: "Enable collection of widget engagement metrics"
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index d47aab061788..e0f2939a2083 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -16,7 +16,6 @@
package com.android.server.appwidget;
-import static android.appwidget.flags.Flags.checkRemoteViewsUriPermission;
import static android.appwidget.flags.Flags.remoteAdapterConversion;
import static android.appwidget.flags.Flags.remoteViewsProto;
import static android.appwidget.flags.Flags.removeAppWidgetServiceIoFromCriticalPath;
@@ -2560,9 +2559,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
// Make sure the package runs under the caller uid.
mSecurityPolicy.enforceCallFromPackage(callingPackage);
// Make sure RemoteViews do not contain URIs that the caller cannot access.
- if (checkRemoteViewsUriPermission()) {
- checkRemoteViewsUris(views);
- }
+ checkRemoteViewsUris(views);
synchronized (mLock) {
ensureGroupStateLoadedLocked(userId);