commit 8ed347f68258e421c305c40c479b470c19b1ce7d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 20 20:41:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 20 20:41:30 2022 +0000
tree 1d8c05332ca399d04ff9fab6faaaa5f0d13a8c7f
parent 9d84c62e6a17b52ea0b84cbe6445bddf17ee474c
parent f2735b49987330fc57f2ab0dae82fbbcbecd1584

Merge "Revert^2 "[binder] Expose public Rust API at crate top level""

cmds/servicemanager/ServiceManager.cpp

diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 4374abe..555be1ed7 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -113,8 +113,8 @@
     if (!found) {
         // Although it is tested, explicitly rebuilding qualified name, in case it
         // becomes something unexpected.
-        LOG(ERROR) << "Could not find " << aname.package << "." << aname.iface << "/"
-                   << aname.instance << " in the VINTF manifest.";
+        LOG(INFO) << "Could not find " << aname.package << "." << aname.iface << "/"
+                  << aname.instance << " in the VINTF manifest.";
     }
 
     return found;

data/etc/Android.bp

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 931c5e3..1be3a69 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -191,6 +191,12 @@
 }
 
 prebuilt_etc {
+    name: "android.hardware.wifi.direct.prebuilt.xml",
+    src: "android.hardware.wifi.direct.xml",
+    defaults: ["frameworks_native_data_etc_defaults"],
+}
+
+prebuilt_etc {
     name: "android.hardware.wifi.passpoint.prebuilt.xml",
     src: "android.hardware.wifi.passpoint.xml",
     defaults: ["frameworks_native_data_etc_defaults"],