Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a5123bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Thread] define the ThreadNetwork hardware feature" into main am:...

Merge "[Thread] define the ThreadNetwork hardware feature" into main am: 32b511f4 am: eefcd7fb am: bced0983

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



Change-Id: I2883ed57cae26bf55dead3045132a8b0063fe79c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b08bf10e bced0983
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -262,6 +262,12 @@ prebuilt_etc {
    defaults: ["frameworks_native_data_etc_defaults"],
}

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",
+19 −0
Original line number Diff line number Diff line
<?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>