From ed76c1b8ea2d40c1f2ea44d4e0157b2a57400cf2 Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Tue, 28 Dec 2021 06:33:23 +0000 Subject: [PATCH] Move Ethernet related files to f/b/packages/ConnectivityT. ethernet-service is going to be moved into Connectivity mainline module. Notice that below sources are also only used in the ethernet framework during compiling the filegroup: framework-connectivity-ethernet-sources. Move them from f/b to f/b/packages/ConnectivityT as well. Ethernet framework only related files: - IInternalNetworkManagementListener.aidl - InternalNetworkManagementException.java - InternalNetworkManagementException.aidl - InternalNetworkUpdateRequest.java - InternalNetworkUpdateRequest.aidl Ethernet service only related files: - DelayedDiskWrite.java(IpConfigStore imports this class) Bug: 210586283 Test: build pass atest FrameworksNetTests atest EthernetServiceTests Change-Id: I1ec2d1d182c04f3f2acc9b757d5061ca749a4a3c --- framework-t/Sources.bp | 5 +++++ .../InternalNetworkManagementException.aidl | 0 .../InternalNetworkManagementException.java | 0 .../net/InternalNetworkUpdateRequest.aidl | 0 .../net/InternalNetworkUpdateRequest.java | 0 service-t/Sources.bp | 1 + .../android/server/net/DelayedDiskWrite.java | 22 ++++++++++++++++--- 7 files changed, 25 insertions(+), 3 deletions(-) rename {core/java => framework-t/src}/android/net/InternalNetworkManagementException.aidl (100%) rename {core/java => framework-t/src}/android/net/InternalNetworkManagementException.java (100%) rename {core/java => framework-t/src}/android/net/InternalNetworkUpdateRequest.aidl (100%) rename {core/java => framework-t/src}/android/net/InternalNetworkUpdateRequest.java (100%) rename {services/core/java => service-t/src}/com/android/server/net/DelayedDiskWrite.java (82%) diff --git a/framework-t/Sources.bp b/framework-t/Sources.bp index d3d8bba16c..223bdcdd9c 100644 --- a/framework-t/Sources.bp +++ b/framework-t/Sources.bp @@ -129,6 +129,11 @@ filegroup { "src/android/net/EthernetNetworkSpecifier.java", "src/android/net/IEthernetManager.aidl", "src/android/net/IEthernetServiceListener.aidl", + "src/android/net/IInternalNetworkManagementListener.aidl", + "src/android/net/InternalNetworkUpdateRequest.java", + "src/android/net/InternalNetworkUpdateRequest.aidl", + "src/android/net/InternalNetworkManagementException.java", + "src/android/net/InternalNetworkManagementException.aidl", "src/android/net/ITetheredInterfaceCallback.aidl", ], path: "src", diff --git a/core/java/android/net/InternalNetworkManagementException.aidl b/framework-t/src/android/net/InternalNetworkManagementException.aidl similarity index 100% rename from core/java/android/net/InternalNetworkManagementException.aidl rename to framework-t/src/android/net/InternalNetworkManagementException.aidl diff --git a/core/java/android/net/InternalNetworkManagementException.java b/framework-t/src/android/net/InternalNetworkManagementException.java similarity index 100% rename from core/java/android/net/InternalNetworkManagementException.java rename to framework-t/src/android/net/InternalNetworkManagementException.java diff --git a/core/java/android/net/InternalNetworkUpdateRequest.aidl b/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl similarity index 100% rename from core/java/android/net/InternalNetworkUpdateRequest.aidl rename to framework-t/src/android/net/InternalNetworkUpdateRequest.aidl diff --git a/core/java/android/net/InternalNetworkUpdateRequest.java b/framework-t/src/android/net/InternalNetworkUpdateRequest.java similarity index 100% rename from core/java/android/net/InternalNetworkUpdateRequest.java rename to framework-t/src/android/net/InternalNetworkUpdateRequest.java diff --git a/service-t/Sources.bp b/service-t/Sources.bp index b261e165a1..36dd20054c 100644 --- a/service-t/Sources.bp +++ b/service-t/Sources.bp @@ -66,6 +66,7 @@ filegroup { filegroup { name: "services.connectivity-ethernet-sources", srcs: [ + "src/com/android/server/net/DelayedDiskWrite.java", "src/com/android/server/net/IpConfigStore.java", ], path: "src", diff --git a/services/core/java/com/android/server/net/DelayedDiskWrite.java b/service-t/src/com/android/server/net/DelayedDiskWrite.java similarity index 82% rename from services/core/java/com/android/server/net/DelayedDiskWrite.java rename to service-t/src/com/android/server/net/DelayedDiskWrite.java index 8f09eb7c19..35dc455725 100644 --- a/services/core/java/com/android/server/net/DelayedDiskWrite.java +++ b/service-t/src/com/android/server/net/DelayedDiskWrite.java @@ -26,21 +26,37 @@ import java.io.DataOutputStream; import java.io.FileOutputStream; import java.io.IOException; +/** + * This class provides APIs to do a delayed data write to a given {@link OutputStream}. + */ public class DelayedDiskWrite { + private static final String TAG = "DelayedDiskWrite"; + private HandlerThread mDiskWriteHandlerThread; private Handler mDiskWriteHandler; /* Tracks multiple writes on the same thread */ private int mWriteSequence = 0; - private final String TAG = "DelayedDiskWrite"; + /** + * Used to do a delayed data write to a given {@link OutputStream}. + */ public interface Writer { - public void onWriteCalled(DataOutputStream out) throws IOException; + /** + * write data to a given {@link OutputStream}. + */ + void onWriteCalled(DataOutputStream out) throws IOException; } + /** + * Do a delayed data write to a given output stream opened from filePath. + */ public void write(final String filePath, final Writer w) { write(filePath, w, true); } + /** + * Do a delayed data write to a given output stream opened from filePath. + */ public void write(final String filePath, final Writer w, final boolean open) { if (TextUtils.isEmpty(filePath)) { throw new IllegalArgumentException("empty file path"); @@ -77,7 +93,7 @@ public class DelayedDiskWrite { if (out != null) { try { out.close(); - } catch (Exception e) {} + } catch (Exception e) { } } // Quit if no more writes sent