Correct the serial flag's namespace
We also need to rename this flag according to go/aconfig-namespace.
NO_EXPORTED_FLAG_DELETION_CHECK=This feature isn't completed so the flag
is never enabled.
Bug: 398768875
Bug: 369155426
Test: atest SerialTests
Flag: android.hardware.serial.flags.enable_wired_serial_api
Change-Id: Iee17aaa692f7a20ed8d0f87cb48c6a8cc4377141
diff --git a/core/api/current.txt b/core/api/current.txt
index 8f64cee..2bb8e59 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -11385,7 +11385,7 @@
field public static final String SEARCH_SERVICE = "search";
field @FlaggedApi("android.os.security_state_service") public static final String SECURITY_STATE_SERVICE = "security_state";
field public static final String SENSOR_SERVICE = "sensor";
- field @FlaggedApi("android.hardware.serial.flags.enable_serial_api") public static final String SERIAL_SERVICE = "serial";
+ field @FlaggedApi("android.hardware.serial.flags.enable_wired_serial_api") public static final String SERIAL_SERVICE = "serial";
field public static final String SHORTCUT_SERVICE = "shortcut";
field public static final String STATUS_BAR_SERVICE = "statusbar";
field public static final String STORAGE_SERVICE = "storage";
@@ -21333,13 +21333,13 @@
package android.hardware.serial {
- @FlaggedApi("android.hardware.serial.flags.enable_serial_api") public final class SerialManager {
+ @FlaggedApi("android.hardware.serial.flags.enable_wired_serial_api") public final class SerialManager {
method @NonNull public java.util.List<android.hardware.serial.SerialPort> getSerialPorts();
method public void registerSerialPortListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.serial.SerialPortListener);
method public void unregisterSerialPortListener(@NonNull android.hardware.serial.SerialPortListener);
}
- @FlaggedApi("android.hardware.serial.flags.enable_serial_api") public final class SerialPort {
+ @FlaggedApi("android.hardware.serial.flags.enable_wired_serial_api") public final class SerialPort {
method @NonNull public String getName();
method public int getProductId();
method public int getVendorId();
@@ -21353,12 +21353,12 @@
field public static final int OPEN_FLAG_WRITE_ONLY = 1; // 0x1
}
- @FlaggedApi("android.hardware.serial.flags.enable_serial_api") public interface SerialPortListener {
+ @FlaggedApi("android.hardware.serial.flags.enable_wired_serial_api") public interface SerialPortListener {
method public void onSerialPortConnected(@NonNull android.hardware.serial.SerialPort);
method public void onSerialPortDisconnected(@NonNull android.hardware.serial.SerialPort);
}
- @FlaggedApi("android.hardware.serial.flags.enable_serial_api") public final class SerialPortResponse {
+ @FlaggedApi("android.hardware.serial.flags.enable_wired_serial_api") public final class SerialPortResponse {
method @NonNull public android.os.ParcelFileDescriptor getFileDescriptor();
method @NonNull public android.hardware.serial.SerialPort getPort();
}
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 942fd49..1d6b9c4 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -18,7 +18,7 @@
import static android.app.appfunctions.flags.Flags.enableAppFunctionManager;
import static android.app.userrecovery.flags.Flags.enableUserRecoveryManager;
-import static android.hardware.serial.flags.Flags.enableSerialApi;
+import static android.hardware.serial.flags.Flags.enableWiredSerialApi;
import static android.provider.flags.Flags.newStoragePublicApi;
import static android.server.Flags.removeGameManagerServiceFromWear;
import static android.service.chooser.Flags.interactiveChooser;
@@ -825,7 +825,7 @@
return new AdbManager(ctx, IAdbManager.Stub.asInterface(b));
}});
- if (enableSerialApi()) {
+ if (enableWiredSerialApi()) {
registerService(Context.SERIAL_SERVICE, android.hardware.serial.SerialManager.class,
new CachedServiceFetcher<android.hardware.serial.SerialManager>() {
@Override
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index ba549bc..9ee5bcc 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5982,7 +5982,7 @@
* @see #getSystemService(String)
* @see android.hardware.serial.SerialManager
*/
- @FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+ @FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
public static final String SERIAL_SERVICE = "serial";
/**
diff --git a/core/java/android/hardware/serial/SerialManager.java b/core/java/android/hardware/serial/SerialManager.java
index e9bf88c..88b5cbb 100644
--- a/core/java/android/hardware/serial/SerialManager.java
+++ b/core/java/android/hardware/serial/SerialManager.java
@@ -37,7 +37,7 @@
* This class allows you to communicate with Serial ports.
*/
@SystemService(Context.SERIAL_SERVICE)
-@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
public final class SerialManager {
private static final String TAG = "SerialManager";
diff --git a/core/java/android/hardware/serial/SerialPort.java b/core/java/android/hardware/serial/SerialPort.java
index db3530d..1b11615 100644
--- a/core/java/android/hardware/serial/SerialPort.java
+++ b/core/java/android/hardware/serial/SerialPort.java
@@ -38,7 +38,7 @@
/**
* A class representing a Serial port.
*/
-@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
public final class SerialPort {
/**
* Value returned by {@link #getVendorId()} and {@link #getProductId()} if this
diff --git a/core/java/android/hardware/serial/SerialPortListener.java b/core/java/android/hardware/serial/SerialPortListener.java
index 758c2ae..66e38585 100644
--- a/core/java/android/hardware/serial/SerialPortListener.java
+++ b/core/java/android/hardware/serial/SerialPortListener.java
@@ -21,7 +21,7 @@
/**
* Listener to monitor serial port connections and disconnections.
*/
-@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
public interface SerialPortListener {
/**
* Called when a supported serial port is connected.
diff --git a/core/java/android/hardware/serial/SerialPortResponse.java b/core/java/android/hardware/serial/SerialPortResponse.java
index 347281b..7e22109 100644
--- a/core/java/android/hardware/serial/SerialPortResponse.java
+++ b/core/java/android/hardware/serial/SerialPortResponse.java
@@ -22,7 +22,7 @@
/**
* Result of opening a serial port.
*/
-@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@FlaggedApi(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
public final class SerialPortResponse {
@NonNull
private final SerialPort mPort;
diff --git a/core/java/android/hardware/serial/flags/flags.aconfig b/core/java/android/hardware/serial/flags/flags.aconfig
index bdb8b40..3e55b4c 100644
--- a/core/java/android/hardware/serial/flags/flags.aconfig
+++ b/core/java/android/hardware/serial/flags/flags.aconfig
@@ -2,8 +2,8 @@
container: "system"
flag {
- name: "enable_serial_api"
- namespace: "serial"
+ name: "enable_wired_serial_api"
+ namespace: "web_apps_on_chromeos_and_android"
description: "Feature flag to enable serial API"
bug: "369155426"
is_exported: true
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 480dd52..1300de5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2520,7 +2520,7 @@
t.traceEnd();
}
- if (android.hardware.serial.flags.Flags.enableSerialApi()) {
+ if (android.hardware.serial.flags.Flags.enableWiredSerialApi()) {
t.traceBegin("StartSerialManagerService");
mSystemServiceManager.startService(SerialManagerService.Lifecycle.class);
t.traceEnd();
diff --git a/services/serial/java/com/android/server/serial/SerialManagerService.java b/services/serial/java/com/android/server/serial/SerialManagerService.java
index b0c12df..5096e1b 100644
--- a/services/serial/java/com/android/server/serial/SerialManagerService.java
+++ b/services/serial/java/com/android/server/serial/SerialManagerService.java
@@ -22,7 +22,7 @@
import static android.hardware.serial.SerialPort.OPEN_FLAG_READ_ONLY;
import static android.hardware.serial.SerialPort.OPEN_FLAG_WRITE_ONLY;
import static android.hardware.serial.SerialPort.OPEN_FLAG_READ_WRITE;
-import static android.hardware.serial.flags.Flags.enableSerialApi;
+import static android.hardware.serial.flags.Flags.enableWiredSerialApi;
import static com.android.server.serial.SerialConstants.DEV_DIR;
@@ -279,7 +279,7 @@
@Override
public void onStart() {
- if (enableSerialApi()) {
+ if (enableWiredSerialApi()) {
publishBinderService(Context.SERIAL_SERVICE, new SerialManagerService());
}
}
diff --git a/tests/SerialTests/src/android/hardware/serial/SerialManagerTest.kt b/tests/SerialTests/src/android/hardware/serial/SerialManagerTest.kt
index d4a13c1..e669463 100644
--- a/tests/SerialTests/src/android/hardware/serial/SerialManagerTest.kt
+++ b/tests/SerialTests/src/android/hardware/serial/SerialManagerTest.kt
@@ -40,7 +40,7 @@
* atest SerialTests:SerialManagerTest
*/
@RunWith(AndroidJUnit4::class)
-@EnableFlags(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@EnableFlags(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
class SerialManagerTest {
@get:Rule
val mockitoRule = MockitoJUnit.rule()
diff --git a/tests/SerialTests/src/android/hardware/serial/SerialPortTest.kt b/tests/SerialTests/src/android/hardware/serial/SerialPortTest.kt
index 0216ead..876947f 100644
--- a/tests/SerialTests/src/android/hardware/serial/SerialPortTest.kt
+++ b/tests/SerialTests/src/android/hardware/serial/SerialPortTest.kt
@@ -42,7 +42,7 @@
* atest SerialTests:SerialPortTest
*/
@RunWith(AndroidJUnit4::class)
-@EnableFlags(android.hardware.serial.flags.Flags.FLAG_ENABLE_SERIAL_API)
+@EnableFlags(android.hardware.serial.flags.Flags.FLAG_ENABLE_WIRED_SERIAL_API)
class SerialPortTest {
@get:Rule
val mockitoRule = MockitoJUnit.rule()
