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

Commit a1065d6a authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] rename threadnetwork to thread_network" into main am:... 

Merge "[Thread] rename threadnetwork to thread_network" into main am: b5c136e7 am: 1683172a am: 46c18042

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



Change-Id: I7a70c4e6aee93f1953ea86c72a8bc0d994901f9c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f329cdc 46c18042

data/etc/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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"],

}

data/etc/android.hardware.threadnetwork.xml→data/etc/android.hardware.thread_network.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>