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

Commit be9ba356 authored by Lee Shombert's avatar Lee Shombert
Browse files

Clean up hasSystemFeature binder cache 

Bug: 140788621

This is a non-functional clean-up.
1. Rename the classes and methods used by the binder cache so that
   everything public is based off of the binder name "hasSystemFeature".
2. Modified the hashCode() method to conform to the comments in cl/9965760

Test: Built a debug image and ran one iteration of MPTS.  Verified that no
errors were seen.

Change-Id: I3ffdda43a7dbe30a12449ff346e1e22b379ee308
parent 614a7316

core/java/android/app/ApplicationPackageManager.java

+13 −13
Original line number Original line Diff line number Diff line
@@ -632,22 +632,22 @@ public class ApplicationPackageManager extends PackageManager { 
    private static final int SYS_FEATURE_CACHE_SIZE = 256;

    private static final int SYS_FEATURE_CACHE_SIZE = 256;

    private static final String CACHE_KEY_SYS_FEATURE_PROPERTY = "cache_key.has_system_feature";

    private static final String CACHE_KEY_SYS_FEATURE_PROPERTY = "cache_key.has_system_feature";





    private class SystemFeatureQuery {

    private class HasSystemFeatureQuery {

        public final String name;

        public final String name;

        public final int version;

        public final int version;

        public SystemFeatureQuery(String n, int v) {

        public HasSystemFeatureQuery(String n, int v) {

            name = n;

            name = n;

            version = v;

            version = v;

        }

        }

        @Override

        @Override

        public String toString() {

        public String toString() {

            return String.format("SystemFeatureQuery(name=\"%s\", version=%d)",

            return String.format("HasSystemFeatureQuery(name=\"%s\", version=%d)",

                    name, version);

                    name, version);

        }

        }

        @Override

        @Override

        public boolean equals(Object o) {

        public boolean equals(Object o) {

            if (o instanceof SystemFeatureQuery) {

            if (o instanceof HasSystemFeatureQuery) {

                SystemFeatureQuery r = (SystemFeatureQuery) o;

                HasSystemFeatureQuery r = (HasSystemFeatureQuery) o;

                return Objects.equals(name, r.name) &&  version == r.version;

                return Objects.equals(name, r.name) &&  version == r.version;

            } else {

            } else {

                return false;

                return false;
@@ -655,32 +655,32 @@ public class ApplicationPackageManager extends PackageManager { 
        }

        }

        @Override

        @Override

        public int hashCode() {

        public int hashCode() {

            return Objects.hashCode(name) + version;

            return Objects.hashCode(name) * 13 + version;

        }

        }

    }

    }





    private final PropertyInvalidatedCache<SystemFeatureQuery, Boolean> mSysFeatureCache =

    private final PropertyInvalidatedCache<HasSystemFeatureQuery, Boolean> mHasSystemFeatureCache =

            new PropertyInvalidatedCache<SystemFeatureQuery, Boolean>(

            new PropertyInvalidatedCache<>(

                SYS_FEATURE_CACHE_SIZE,

                SYS_FEATURE_CACHE_SIZE,

                CACHE_KEY_SYS_FEATURE_PROPERTY) {

                CACHE_KEY_SYS_FEATURE_PROPERTY) {

                @Override

                @Override

                protected Boolean recompute(SystemFeatureQuery query) {

                protected Boolean recompute(HasSystemFeatureQuery query) {

                    return hasSystemFeatureUncached(query.name, query.version);

                    return hasSystemFeatureUncached(query.name, query.version);

                }

                }

            };

            };





    @Override

    @Override

    public boolean hasSystemFeature(String name, int version) {

    public boolean hasSystemFeature(String name, int version) {

        return mSysFeatureCache.query(new SystemFeatureQuery(name, version)).booleanValue();

        return mHasSystemFeatureCache.query(new HasSystemFeatureQuery(name, version));

    }

    }





    /** @hide */

    /** @hide */

    public void disableSysFeatureCache() {

    public void disableHasSystemFeatureCache() {

        mSysFeatureCache.disableLocal();

        mHasSystemFeatureCache.disableLocal();

    }

    }





    /** @hide */

    /** @hide */

    public static void invalidateSysFeatureCache() {

    public static void invalidateHasSystemFeatureCache() {

        PropertyInvalidatedCache.invalidateCache(CACHE_KEY_SYS_FEATURE_PROPERTY);

        PropertyInvalidatedCache.invalidateCache(CACHE_KEY_SYS_FEATURE_PROPERTY);

    }

    }

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2723,7 +2723,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        t.traceBegin("get system config");

        t.traceBegin("get system config");

        SystemConfig systemConfig = SystemConfig.getInstance();

        SystemConfig systemConfig = SystemConfig.getInstance();

        mAvailableFeatures = systemConfig.getAvailableFeatures();

        mAvailableFeatures = systemConfig.getAvailableFeatures();

        ApplicationPackageManager.invalidateSysFeatureCache();

        ApplicationPackageManager.invalidateHasSystemFeatureCache();

        t.traceEnd();

        t.traceEnd();

















        mProtectedPackages = new ProtectedPackages(mContext);







        mProtectedPackages = new ProtectedPackages(mContext);