From 1df9a1e8f5b1c6697f249e7b4b5b5b0fa29a8233 Mon Sep 17 00:00:00 2001
From: Pedro Loureiro <pedroql@google.com>
Date: Wed, 22 Dec 2021 19:42:44 +0000
Subject: [PATCH] Rename updatable-library to apex-library

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
---
 core/java/com/android/server/SystemConfig.java                | 4 ++--
 .../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 be5dc0039ac6c..6c0a2888e8980 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 4dcd633b45604..9623907add6aa 100644
--- a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
+++ b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
@@ -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"