diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-07-24 15:05:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-24 15:05:03 +0000 |
| commit | 5444b56413f857d30f1e78c3b58568d9d797d19f (patch) | |
| tree | 0b85106ef524634441f03c6da54da37c3b947169 /data | |
| parent | 7288323448b2658afbbaedb282238974eb54594a (diff) | |
| parent | 5a5123bbd1fcb4169d9ceb1c7104d216d2bcaf57 (diff) | |
| download | native-5444b56413f857d30f1e78c3b58568d9d797d19f.tar.gz | |
Merge "[Thread] define the ThreadNetwork hardware feature" into main am: 32b511f471 am: eefcd7fb2f am: bced098348 am: 5a5123bbd1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2605745
Change-Id: Ifc32ad55be743ff91d67d63b4cb7161151afa7f5
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 | 6 | ||||
| -rw-r--r-- | data/etc/android.hardware.threadnetwork.xml | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 226cae12aa..2143d93632 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -263,6 +263,12 @@ prebuilt_etc { } prebuilt_etc { + name: "android.hardware.threadnetwork.prebuilt.xml", + src: "android.hardware.threadnetwork.xml", + defaults: ["frameworks_native_data_etc_defaults"], +} + +prebuilt_etc { name: "android.hardware.usb.accessory.prebuilt.xml", src: "android.hardware.usb.accessory.xml", defaults: ["frameworks_native_data_etc_defaults"], diff --git a/data/etc/android.hardware.threadnetwork.xml b/data/etc/android.hardware.threadnetwork.xml new file mode 100644 index 0000000000..9cbdc905fb --- /dev/null +++ b/data/etc/android.hardware.threadnetwork.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- Adds the feature indicating support for the ThreadNetwork API --> +<permissions> + <feature name="android.hardware.threadnetwork" /> +</permissions> |