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

Commit 72049508 authored by Pedro Loureiro's avatar Pedro Loureiro Committed by Android (Google) Code Review
Browse files

Merge "Rename updatable-library to apex-library"

parents c452e344 c2d3032e

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
@@ -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"