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

Commit 1e132a4c authored by Svet Ganov's avatar Svet Ganov
Browse files

Address comments for ag/3587350 

Test: cts-tradefed run cts -m CtsAutoFillServiceTestCases

Change-Id: I2d46e1234b8455e3f925bc1be29e6c2fbe19c252
parent 020731e9

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+11 −16
Original line number Diff line number Diff line
@@ -327,11 +327,7 @@ public final class AutofillManagerService extends SystemService { 
                    mUiLatencyHistory, mWtfHistory, resolvedUserId, mUi,

                    mDisabledUsers.get(resolvedUserId));

            mServicesCache.put(userId, service);

            final ArrayMap<String, Pair<Long, String>> compatPackages =

                    service.getCompatibilityPackagesLocked();

            if (compatPackages != null) {

                addCompatibilityModeRequests(compatPackages, userId);

            }

            addCompatibilityModeRequestsLocked(service, userId);

        }

        return service;

    }
@@ -521,24 +517,23 @@ public final class AutofillManagerService extends SystemService { 
            if (!service.isEnabledLocked()) {

                removeCachedServiceLocked(userId);

            } else {

                final ArrayMap<String, Pair<Long, String>> compatPackages =

                        service.getCompatibilityPackagesLocked();

                if (compatPackages != null) {

                    addCompatibilityModeRequests(compatPackages, userId);

                }

                addCompatibilityModeRequestsLocked(service, userId);

            }

        }

    }



    private void addCompatibilityModeRequests(

            @NonNull ArrayMap<String, Pair<Long, String>> compatPackages, int userId) {

        final Set<String> whiteListedPackages = Build.IS_ENG ? null

                : getWhitelistedCompatModePackages();

    private void addCompatibilityModeRequestsLocked(@NonNull AutofillManagerServiceImpl service

            , int userId) {

        final ArrayMap<String, Pair<Long, String>> compatPackages =

                service.getCompatibilityPackagesLocked();

        if (compatPackages == null || compatPackages.isEmpty()) {

            return;

        }

        final Set<String> whiteListedPackages = getWhitelistedCompatModePackages();

        final int compatPackageCount = compatPackages.size();

        for (int i = 0; i < compatPackageCount; i++) {

            final String packageName = compatPackages.keyAt(i);

            if (!Build.IS_ENG && (whiteListedPackages == null

                    || !whiteListedPackages.contains(packageName))) {

            if (whiteListedPackages == null || !whiteListedPackages.contains(packageName)) {

                Slog.w(TAG, "Ignoring not whitelisted compat package " + packageName);

                continue;

            }