Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove prefix property from platform_compat_config module"

Browse Source
This commit is contained in:
Anna Trostanetski
2019-08-29 16:57:34 +00:00
committed by Gerrit Code Review
parent aff95e5e7c 7aa64a78ae
commit cc55cca985
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -340,7 +340,6 @@ java_library {
platform_compat_config { platform_compat_config {
name: "framework-platform-compat-config", name: "framework-platform-compat-config",
prefix: "framework",
src: ":framework-annotation-proc", src: ":framework-annotation-proc",
} }

1
services/Android.bp
View File

@@ -57,6 +57,5 @@ cc_library_shared {
platform_compat_config { platform_compat_config {
name: "services-platform-compat-config", name: "services-platform-compat-config",
prefix: "services",
src: ":services", src: ":services",
} }

8
services/core/java/com/android/server/compat/CompatConfig.java
View File

@@ -47,11 +47,10 @@ import javax.xml.datatype.DatatypeConfigurationException;
public final class CompatConfig { public final class CompatConfig {
private static final String TAG = "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( private static final CompatConfig sInstance = new CompatConfig().initConfigFromLib(
Environment.buildPath( Environment.buildPath(
Environment.getRootDirectory(), "etc", "sysconfig")); Environment.getRootDirectory(), "etc", "compatconfig"));
@GuardedBy("mChanges") @GuardedBy("mChanges")
private final LongSparseArray<CompatChange> mChanges = new LongSparseArray<>(); private final LongSparseArray<CompatChange> mChanges = new LongSparseArray<>();
@@ -212,18 +211,17 @@ public final class CompatConfig {
return this; return this;
} }
for (File f : libraryDir.listFiles()) { for (File f : libraryDir.listFiles()) {
Slog.d(TAG, "Found a config file: " + f.getPath());
//TODO(b/138222363): Handle duplicate ids across config files. //TODO(b/138222363): Handle duplicate ids across config files.
if (f.getPath().endsWith(CONFIG_FILE_SUFFIX)) {
readConfig(f); readConfig(f);
} }
}
return this; return this;
} }
private void readConfig(File configFile) { private void readConfig(File configFile) {
try (InputStream in = new BufferedInputStream(new FileInputStream(configFile))) { try (InputStream in = new BufferedInputStream(new FileInputStream(configFile))) {
for (Change change : XmlParser.read(in).getCompatChange()) { for (Change change : XmlParser.read(in).getCompatChange()) {
Slog.w(TAG, "Adding: " + change.toString()); Slog.d(TAG, "Adding: " + change.toString());
addChange(new CompatChange(change)); addChange(new CompatChange(change));
} }
} catch (IOException | DatatypeConfigurationException | XmlPullParserException e) { } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) {