commit a1065d6a814dce6da2f0e69d321d86c22f92e171
author Kangping Dong <wgtdkp@google.com> Fri Aug 11 04:35:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 11 04:35:55 2023 +0000
tree e382cc452edf7a65ec259b5220d8eda251197645
parent 5f329cdc94b7bc2454aeec31a31fc5bde6315048
parent 46c1804205f7f1468e4d9dcfacc4ae9ad3aa01c6

Merge "[Thread] rename threadnetwork to thread_network" into main am: b5c136e70b am: 1683172a73 am: 46c1804205

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2688987

Change-Id: I7a70c4e6aee93f1953ea86c72a8bc0d994901f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

data/etc/Android.bp

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 2143d93..4327e28 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -263,8 +263,8 @@
 }
 
 prebuilt_etc {
-    name: "android.hardware.threadnetwork.prebuilt.xml",
-    src: "android.hardware.threadnetwork.xml",
+    name: "android.hardware.thread_network.prebuilt.xml",
+    src: "android.hardware.thread_network.xml",
     defaults: ["frameworks_native_data_etc_defaults"],
 }
 

data/etc/android.hardware.thread_network.xml

diff --git a/data/etc/android.hardware.threadnetwork.xml b/data/etc/android.hardware.thread_network.xml
similarity index 83%
rename from data/etc/android.hardware.threadnetwork.xml
rename to data/etc/android.hardware.thread_network.xml
index 9cbdc90..b116ed6 100644
--- a/data/etc/android.hardware.threadnetwork.xml
+++ b/data/etc/android.hardware.thread_network.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<!-- Adds the feature indicating support for the ThreadNetwork API -->
+<!-- Adds the feature indicating support for the Thread networking protocol -->
 <permissions>
-    <feature name="android.hardware.threadnetwork" />
+    <feature name="android.hardware.thread_network" />
 </permissions>