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

Commit ecadb8d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix RegisteredServicesCacheTest failure" into main

parents c06d1334 e495463d

core/java/android/content/pm/RegisteredServicesCache.java

+7 −6
Original line number Diff line number Diff line
@@ -527,8 +527,8 @@ public abstract class RegisteredServicesCache<V> { 
                    lastUpdateTime = packageInfo.lastUpdateTime;

                } catch (NameNotFoundException | SecurityException e) {

                    Slog.d(TAG, "Fail to get the PackageInfo in generateServicesMap: " + e);

                    continue;

                }

                if (lastUpdateTime >= 0) {

                    ServiceInfo<V> serviceInfo = getServiceInfoFromServiceCache(componentName,

                            lastUpdateTime);

                    if (serviceInfo != null) {
@@ -536,6 +536,7 @@ public abstract class RegisteredServicesCache<V> { 
                        continue;

                    }

                }

            }

            try {

                ServiceInfo<V> info = parseServiceInfo(resolveInfo, lastUpdateTime);

                if (info == null) {