diff options
| author | Kangping Dong <wgtdkp@google.com> | 2023-08-11 05:16:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-11 05:16:34 +0000 |
| commit | f1eb5637ec435f373b5bceb7ca2f2140c2dc3c06 (patch) | |
| tree | 243e6e96f2b856ad5398d82258ca6a2ad8b89f24 /data | |
| parent | 77097116ae53ae129fe3ccee2c3b444340dfb070 (diff) | |
| parent | a1065d6a814dce6da2f0e69d321d86c22f92e171 (diff) | |
| download | native-f1eb5637ec435f373b5bceb7ca2f2140c2dc3c06.tar.gz | |
Merge "[Thread] rename threadnetwork to thread_network" into main am: b5c136e70b am: 1683172a73 am: 46c1804205 am: a1065d6a81
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2688987
Change-Id: I6848f3db0c3d3ebe7089607c2b96c2536e8859fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/Android.bp | 4 | ||||
| -rw-r--r-- | data/etc/android.hardware.thread_network.xml (renamed from data/etc/android.hardware.threadnetwork.xml) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 2143d93632..4327e28518 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -263,8 +263,8 @@ prebuilt_etc { } 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"], } diff --git a/data/etc/android.hardware.threadnetwork.xml b/data/etc/android.hardware.thread_network.xml index 9cbdc905fb..b116ed6bf8 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> |