commit 5a3517e5cd19c6d0845653425266e7c4ed9fd2df
author Xin Li <delphij@google.com> Fri Oct 06 05:34:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 06 05:34:16 2023 +0000
tree 27be64752f857640c3eabaf8862826ad4d1aa0ac
parent 5ce65cd53b8ecfb4f50838319f094511728fe505
parent 1c77f09ccdbf0d42025693f8432f8d8cc0301e89

Merge "Merge Android 14" into main

common/Android.bp

diff --git a/common/Android.bp b/common/Android.bp
index ff4de11..e10ede8 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -19,6 +19,10 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// This is a placeholder comment to avoid merge conflicts
+// as the above target may not exist
+// depending on the branch
+
 java_library {
     name: "connectivity-net-module-utils-bpf",
     srcs: [

common/flags.aconfig

diff --git a/common/flags.aconfig b/common/flags.aconfig
new file mode 100644
index 0000000..4926503
--- /dev/null
+++ b/common/flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.net.flags"
+
+flag {
+  name: "track_multiple_network_activities"
+  namespace: "android_core_networking"
+  description: "NetworkActivityTracker tracks multiple networks including non default networks"
+  bug: "267870186"
+}

service-t/Sources.bp

diff --git a/service-t/Sources.bp b/service-t/Sources.bp
index 187eadf..fbe02a5 100644
--- a/service-t/Sources.bp
+++ b/service-t/Sources.bp
@@ -20,7 +20,6 @@
     srcs: [
         "jni/com_android_server_net_NetworkStatsFactory.cpp",
     ],
-    path: "jni",
     visibility: [
         "//packages/modules/Connectivity:__subpackages__",
     ],
@@ -32,7 +31,6 @@
         "jni/com_android_server_net_NetworkStatsFactory.cpp",
         "jni/com_android_server_net_NetworkStatsService.cpp",
     ],
-    path: "jni",
     visibility: [
         "//packages/modules/Connectivity:__subpackages__",
     ],