commit 592430c84e4454f65a110fbde1d7662547bfcf3c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 24 21:06:59 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 24 21:06:59 2024 +0000
tree 3a9fe5e04adccb520ae4f905f2714e73a7c54e20
parent 1a48b2d4165af2cc3f71148b424595f30fc50a0d
parent 657284d4ef31a9829c13fef818fe2d41f8c0382e

Merge "audio: Use 'join' instead of 'stop' for stream workers" into main

memtrack/OWNERS

diff --git a/memtrack/OWNERS b/memtrack/OWNERS
index a182ed9..8017da6 100644
--- a/memtrack/OWNERS
+++ b/memtrack/OWNERS
@@ -1,2 +1,3 @@
-# Bug component: 30545
-connoro@google.com
+# Bug component: 356484
+kaleshsingh@google.com
+surenb@google.com

wifi/aidl/default/Android.bp

diff --git a/wifi/aidl/default/Android.bp b/wifi/aidl/default/Android.bp
index 362ef1b..2047807 100644
--- a/wifi/aidl/default/Android.bp
+++ b/wifi/aidl/default/Android.bp
@@ -218,3 +218,8 @@
     name: "default-android.hardware.wifi-service.xml",
     srcs: ["android.hardware.wifi-service.xml"],
 }
+
+filegroup {
+    name: "default-android.hardware.wifi-service-lazy.rc",
+    srcs: ["android.hardware.wifi-service-lazy.rc"],
+}

wifi/netlinkinterceptor/aidl/default/Android.bp

diff --git a/wifi/netlinkinterceptor/aidl/default/Android.bp b/wifi/netlinkinterceptor/aidl/default/Android.bp
index 6bdd9fc..52f15e4 100644
--- a/wifi/netlinkinterceptor/aidl/default/Android.bp
+++ b/wifi/netlinkinterceptor/aidl/default/Android.bp
@@ -76,3 +76,13 @@
     sub_dir: "vintf",
     installable: false,
 }
+
+filegroup {
+    name: "android.hardware.net.nlinterceptor-service.rc",
+    srcs: ["nlinterceptor.rc"],
+}
+
+filegroup {
+    name: "android.hardware.net.nlinterceptor.xml",
+    srcs: ["nlinterceptor.xml"],
+}