Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b37b94b authored by Jackal Guo's avatar Jackal Guo Committed by Automerger Merge Worker
Browse files

Merge "Apply package visibility to AppWidgetManager#getInstalledProviders"... 

Merge "Apply package visibility to AppWidgetManager#getInstalledProviders" into sc-dev am: 57601cc7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14233607

Change-Id: I5ea20cc0f58bd3682c924df85ccd66423e4b3744
parents d5ea4714 57601cc7

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+7 −3
Original line number Diff line number Diff line
@@ -1589,6 +1589,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
    public ParceledListSlice<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter,

            int profileId, String packageName) {

        final int userId = UserHandle.getCallingUserId();

        final int callingUid = Binder.getCallingUid();



        if (DEBUG) {

            Slog.i(TAG, "getInstalledProvidersForProfiles() " + userId);
@@ -1601,7 +1602,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 


        synchronized (mLock) {

            if (mSecurityPolicy.isCallerInstantAppLocked()) {

                Slog.w(TAG, "Instant uid " + Binder.getCallingUid()

                Slog.w(TAG, "Instant uid " + callingUid

                        + " cannot access widget providers");

                return ParceledListSlice.emptyList();

            }
@@ -1614,11 +1615,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            for (int i = 0; i < providerCount; i++) {

                Provider provider = mProviders.get(i);

                AppWidgetProviderInfo info = provider.getInfoLocked(mContext);

                final String providerPackageName = provider.id.componentName.getPackageName();



                // Ignore an invalid provider, one not matching the filter,

                // or one that isn't in the given package, if any.

                boolean inPackage = packageName == null

                        || provider.id.componentName.getPackageName().equals(packageName);

                        || providerPackageName.equals(packageName);

                if (provider.zombie || (info.widgetCategory & categoryFilter) == 0 || !inPackage) {

                    continue;

                }
@@ -1627,7 +1629,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                final int providerProfileId = info.getProfile().getIdentifier();

                if (providerProfileId == profileId

                        && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(

                            provider.id.componentName.getPackageName(), providerProfileId)) {

                        providerPackageName, providerProfileId)

                        && !mPackageManagerInternal.filterAppAccess(providerPackageName, callingUid,

                        userId)) {

                    result.add(cloneIfLocalBinder(info));

                }

            }