Merge "Revert "Prevent unintentional removal of widgets pinned by another host"" into main

1 files changed, 0 insertions, 20 deletions

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index 1dba629b9a55..cffdfbd36532 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -5666,13 +5666,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
         }
 
         public boolean canAccessAppWidget(Widget widget, int uid, String packageName) {
-            if (isDifferentPackageFromHost(widget.host, packageName)
-                    && isDifferentPackageFromProvider(widget.provider, packageName)) {
-                // Apps providing AppWidget are only allowed to access widgets provided by the
-                // same package. Similarly, apps hosting AppWidget are only allowed to access
-                // widgets hosted by the same package.
-                return false;
-            }
             if (isHostInPackageForUid(widget.host, uid, packageName)) {
                 // Apps hosting the AppWidget have access to it.
                 return true;
@@ -5775,19 +5768,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
                     && provider.id.componentName.getPackageName().equals(packageName);
         }
 
-        private boolean isDifferentPackageFromHost(
-                @Nullable final Host host, @Nullable final String packageName) {
-            return packageName == null || host == null || host.id == null
-                || !packageName.equals(host.id.packageName);
-        }
-
-        private boolean isDifferentPackageFromProvider(
-                @Nullable final Provider provider, @Nullable final String packageName) {
-            return packageName == null || provider == null || provider.id == null
-                    || provider.id.componentName == null
-                    || !packageName.equals(provider.id.componentName.getPackageName());
-        }
-
         private boolean isProfileEnabled(int profileId) {
             final long identity = Binder.clearCallingIdentity();
             try {