diff options
| author | 2022-01-06 09:04:03 +0000 | |
|---|---|---|
| committer | 2022-01-06 09:04:03 +0000 | |
| commit | 72049508c5ea65357e890724d9e29a469ca3b198 (patch) | |
| tree | 19402dc90f7c2a1561aa89666b41e21401bc0672 | |
| parent | c452e344602be084450966befef9b7e6e88179a2 (diff) | |
| parent | c2d3032e884e775837fe43480900c80c6a83426d (diff) | |
Merge "Rename updatable-library to apex-library"
| -rw-r--r-- | core/java/com/android/server/SystemConfig.java | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index d66f4614e0e8..39f17e510a1c 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -849,8 +849,8 @@ public class SystemConfig { XmlUtils.skipCurrentTag(parser); } } break; - case "updatable-library": - // "updatable-library" is meant to behave exactly like "library" + case "apex-library": + // "apex-library" is meant to behave exactly like "library" case "library": { if (allowLibs) { String lname = parser.getAttributeValue(null, "name"); diff --git a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java index add4cdaa28ce..eeaf781dd307 100644 --- a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java +++ b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java @@ -357,13 +357,13 @@ public class SystemConfigTest { /** * Tests that readPermissions works correctly for a library using the new - * {@code updatable-library} tag. + * {@code apex-library} tag. */ @Test public void readPermissions_allowLibs_parsesUpdatableLibrary() throws IOException { String contents = "<permissions>\n" - + " <updatable-library \n" + + " <apex-library \n" + " name=\"foo\"\n" + " file=\"" + mFooJar + "\"\n" + " on-bootclasspath-before=\"10\"\n" |