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

Commit eb6576d6 authored by Anna Trostanetski's avatar Anna Trostanetski Committed by android-build-merger
Browse files

Merge "Remove prefix property from platform_compat_config module" 

am: cc55cca9

Change-Id: Id0739fe8a6460a361243a029d259c608e3d9e736
parents 2d7cc3ac cc55cca9

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ java_library { 


platform_compat_config {

    name: "framework-platform-compat-config",

    prefix: "framework",

    src: ":framework-annotation-proc",

}

services/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -62,6 +62,5 @@ cc_library_shared { 


platform_compat_config {

    name: "services-platform-compat-config",

    prefix: "services",

    src: ":services",

}

services/core/java/com/android/server/compat/CompatConfig.java

+4 −6
Original line number Diff line number Diff line
@@ -47,11 +47,10 @@ import javax.xml.datatype.DatatypeConfigurationException; 
public final class CompatConfig {



    private static final String TAG = "CompatConfig";

    private static final String CONFIG_FILE_SUFFIX = "platform_compat_config.xml";



    private static final CompatConfig sInstance = new CompatConfig().initConfigFromLib(

            Environment.buildPath(

                    Environment.getRootDirectory(), "etc", "sysconfig"));

                    Environment.getRootDirectory(), "etc", "compatconfig"));



    @GuardedBy("mChanges")

    private final LongSparseArray<CompatChange> mChanges = new LongSparseArray<>();
@@ -212,18 +211,17 @@ public final class CompatConfig { 
            return this;

        }

        for (File f : libraryDir.listFiles()) {

            Slog.d(TAG, "Found a config file: " + f.getPath());

            //TODO(b/138222363): Handle duplicate ids across config files.

            if (f.getPath().endsWith(CONFIG_FILE_SUFFIX)) {

            readConfig(f);

        }

        }

        return this;

    }



    private void readConfig(File configFile) {

        try (InputStream in = new BufferedInputStream(new FileInputStream(configFile))) {

            for (Change change : XmlParser.read(in).getCompatChange()) {

                Slog.w(TAG, "Adding: " + change.toString());

                Slog.d(TAG, "Adding: " + change.toString());

                addChange(new CompatChange(change));

            }

        } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) {