diff options
| author | 2023-08-11 01:58:39 +0000 | |
|---|---|---|
| committer | 2023-08-11 01:58:39 +0000 | |
| commit | b5c136e70bce4d3b2570efbeeeb033637b0cafe7 (patch) | |
| tree | 31153be856ee94acfe40007ed509b471c0190d8d | |
| parent | d56c5ca60360312775847f21132aafdf31c52432 (diff) | |
| parent | bfbf68aa7a509698afc8ef51956a557859234cd2 (diff) | |
Merge "[Thread] rename threadnetwork to thread_network" into main
| -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 92dc46ed8d..60fb134c3c 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -173,8 +173,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> |