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

Commit 23672272 authored by Pedro Loureiro's avatar Pedro Loureiro Committed by Automerger Merge Worker
Browse files

Rename updatable-library to apex-library am: 1df9a1e8 am: be595a1c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954037

Change-Id: I89d0a4a0ef490a8bc8d9bd41c346aece4e1df58e
parents c19d3ed9 be595a1c

core/java/com/android/server/SystemConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -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");

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

+2 −2
Original line number Diff line number Diff line
@@ -354,13 +354,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=\"foo.jar\"\n"

                        + "        on-bootclasspath-before=\"10\"\n"