diff options
| author | 2023-08-11 07:32:57 +0000 | |
|---|---|---|
| committer | 2023-08-11 07:32:57 +0000 | |
| commit | 510a1070e61a507151e29f3496db75cd7187015a (patch) | |
| tree | cc24bf31fca5eb55d48f65054e141c10c248ed8b | |
| parent | 2e5e67bc7f8f6c4120660f8812a84fa8d5f9f2d9 (diff) | |
| parent | f1eb5637ec435f373b5bceb7ca2f2140c2dc3c06 (diff) | |
Merge "[Thread] rename threadnetwork to thread_network" into main am: b5c136e70b am: 1683172a73 am: 46c1804205 am: a1065d6a81 am: f1eb5637ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2688987
Change-Id: I732e5c84aeb5e9cf6cf7a9d3a80068cecfc9fbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 3ce586bcd6..c962c15a24 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> |