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

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

Merge "Add FEATURE_TELEPHONY_SATELLITE feature definition" am: fae4569b am: 0209a1af 

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



Change-Id: If44cfc70ea7df7c6e6c329f905fba0ccd700cf1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 525b65af 0209a1af

data/etc/Android.bp

+6 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,12 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

    defaults: ["frameworks_native_data_etc_defaults"],

}

}





prebuilt_etc {

    name: "android.hardware.telephony.satellite.prebuilt.xml",

    src: "android.hardware.telephony.satellite.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

prebuilt_etc {

    name: "android.hardware.usb.accessory.prebuilt.xml",

    name: "android.hardware.usb.accessory.prebuilt.xml",

    src: "android.hardware.usb.accessory.xml",

    src: "android.hardware.usb.accessory.xml",

data/etc/android.hardware.telephony.satellite.xml

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 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.

-->



<!-- Feature for devices that support Satellite communication via Satellite HAL APIs. -->

<permissions>

    <feature name="android.hardware.telephony.satellite" />

</permissions>