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

Rename updatable-library to apex-library

Browse Source 
Mostly for consistency with the names used in related changes.

Test: atest com.android.server.pm.parsing.library.ApexSharedLibraryUpdaterTest com.android.server.systemconfig.SystemConfigTest

Bug: 191978330
Change-Id: Ic4ccc0fdca100b576e28bc0918d378cabae9ce61
Merged-In: Ic4ccc0fdca100b576e28bc0918d378cabae9ce61
This commit is contained in:
Pedro Loureiro
2021-12-22 19:42:44 +00:00
committed by Andrei Onea
parent 5c228ca3e9
commit 1df9a1e8f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/server/SystemConfig.java
View File

@@ -849,8 +849,8 @@ public class SystemConfig {
XmlUtils.skipCurrentTag(parser); XmlUtils.skipCurrentTag(parser);
} }
} break; } break;
case "updatable-library": case "apex-library":
// "updatable-library" is meant to behave exactly like "library" // "apex-library" is meant to behave exactly like "library"
case "library": { case "library": {
if (allowLibs) { if (allowLibs) {
String lname = parser.getAttributeValue(null, "name"); String lname = parser.getAttributeValue(null, "name");

4
services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
View File

@@ -354,13 +354,13 @@ public class SystemConfigTest {
/** /**
* Tests that readPermissions works correctly for a library using the new * Tests that readPermissions works correctly for a library using the new
* {@code updatable-library} tag. * {@code apex-library} tag.
*/ */
@Test @Test
public void readPermissions_allowLibs_parsesUpdatableLibrary() throws IOException { public void readPermissions_allowLibs_parsesUpdatableLibrary() throws IOException {
String contents = String contents =
"<permissions>\n" "<permissions>\n"
+ " <updatable-library \n" + " <apex-library \n"
+ " name=\"foo\"\n" + " name=\"foo\"\n"
+ " file=\"foo.jar\"\n" + " file=\"foo.jar\"\n"
+ " on-bootclasspath-before=\"10\"\n" + " on-bootclasspath-before=\"10\"\n"