diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/Android.bp | 10 | ||||
| -rw-r--r-- | data/etc/com.android.networkstack.tethering.xml | 28 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 28 | ||||
| -rw-r--r-- | data/keyboards/Vendor_0171_Product_0419.kl | 55 |
4 files changed, 73 insertions, 48 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index be1e2b2247fb..dc077583963e 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C} 2018 The Android Open Source Project +// Copyright (C) 2018 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. @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. - // Sysconfig files package { @@ -134,13 +133,6 @@ prebuilt_etc { } prebuilt_etc { - name: "privapp_whitelist_com.android.networkstack.tethering", - sub_dir: "permissions", - src: "com.android.networkstack.tethering.xml", - filename_from_src: true, -} - -prebuilt_etc { name: "privapp_whitelist_com.android.provision", system_ext_specific: true, sub_dir: "permissions", diff --git a/data/etc/com.android.networkstack.tethering.xml b/data/etc/com.android.networkstack.tethering.xml deleted file mode 100644 index f26a9616e07a..000000000000 --- a/data/etc/com.android.networkstack.tethering.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2021 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 ---> - -<permissions> - <privapp-permissions package="com.android.networkstack.tethering"> - <permission name="android.permission.BLUETOOTH_PRIVILEGED" /> - <permission name="android.permission.MANAGE_USB"/> - <permission name="android.permission.MODIFY_PHONE_STATE"/> - <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/> - <permission name="android.permission.TETHER_PRIVILEGED"/> - <permission name="android.permission.UPDATE_APP_OPS_STATS"/> - <permission name="android.permission.UPDATE_DEVICE_STATS"/> - </privapp-permissions> -</permissions> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 813b7995fe89..191d4005e575 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -202,6 +202,8 @@ applications that come with the platform <permission name="android.permission.READ_PRECISE_PHONE_STATE"/> <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/> <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/> + <permission name="android.permission.LOG_COMPAT_CHANGE"/> + <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG"/> </privapp-permissions> <privapp-permissions package="com.android.providers.calendar"> @@ -223,6 +225,8 @@ applications that come with the platform <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/> <permission name="android.permission.UPDATE_APP_OPS_STATS"/> <permission name="android.permission.USE_RESERVED_DISK"/> + <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" /> + <permission name="android.permission.LOG_COMPAT_CHANGE" /> </privapp-permissions> <privapp-permissions package="com.android.providers.downloads"> @@ -386,9 +390,15 @@ applications that come with the platform <permission name="android.permission.SET_WALLPAPER" /> <permission name="android.permission.SET_WALLPAPER_COMPONENT" /> <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" /> + <!-- Permission required for CTS test - TrustTestCases --> + <permission name="android.permission.PROVIDE_TRUST_AGENT" /> + <permission name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> + <permission name="android.permission.TRUST_LISTENER" /> <!-- Permissions required for Incremental CTS tests --> <permission name="com.android.permission.USE_INSTALLER_V2"/> <permission name="android.permission.LOADER_USAGE_STATS"/> + <!-- Permissions required for Package Verifier tests --> + <permission name="android.permission.PACKAGE_VERIFICATION_AGENT" /> <!-- Permission required to test system only camera devices. --> <permission name="android.permission.SYSTEM_CAMERA" /> <!-- Permission required to test ExplicitHealthCheckServiceImpl. --> @@ -452,6 +462,11 @@ applications that come with the platform <!-- Permission needed for CTS test - WifiManagerTest --> <permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" /> <permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" /> + <permission name="android.permission.NEARBY_WIFI_DEVICES" /> + <permission name="android.permission.OVERRIDE_WIFI_CONFIG" /> + <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover + P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. --> + <permission name="android.permission.MANAGE_WIFI_AUTO_JOIN" /> <!-- Permission required for CTS test CarrierMessagingServiceWrapperTest --> <permission name="android.permission.BIND_CARRIER_SERVICES"/> <!-- Permission required for CTS test - MusicRecognitionManagerTest --> @@ -499,6 +514,8 @@ applications that come with the platform <permission name="android.permission.UPDATE_DEVICE_STATS" /> <!-- Permission required for GTS test - PendingSystemUpdateTest --> <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> + <!-- Permission required for ATS test - CarDevicePolicyManagerTest --> + <permission name="android.permission.LOCK_DEVICE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> @@ -507,17 +524,6 @@ applications that come with the platform <permission name="android.permission.INTERACT_ACROSS_USERS"/> </privapp-permissions> - <privapp-permissions package="com.android.traceur"> - <!-- Permissions required to receive BUGREPORT_STARTED intent --> - <permission name="android.permission.DUMP"/> - <!-- Permissions required to start/stop tracing --> - <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/> - <!-- Permissions required for quick settings tile --> - <permission name="android.permission.STATUS_BAR"/> - <!-- Permissions required to query Betterbug --> - <permission name="android.permission.QUERY_ALL_PACKAGES"/> - </privapp-permissions> - <privapp-permissions package="com.android.tv"> <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/> <permission name="android.permission.DVB_DEVICE"/> diff --git a/data/keyboards/Vendor_0171_Product_0419.kl b/data/keyboards/Vendor_0171_Product_0419.kl new file mode 100644 index 000000000000..05a25f0210c8 --- /dev/null +++ b/data/keyboards/Vendor_0171_Product_0419.kl @@ -0,0 +1,55 @@ +# Copyright (C) 2021 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. + +# +# Amazon Luna Controller +# + +key 304 BUTTON_A +key 305 BUTTON_B +key 307 BUTTON_X +key 308 BUTTON_Y +key 310 BUTTON_L1 +key 311 BUTTON_R1 + +key 317 BUTTON_THUMBL +key 318 BUTTON_THUMBR + +# Left and right stick. +axis 0x00 X flat 4096 +axis 0x01 Y flat 4096 +axis 0x02 Z flat 4096 +axis 0x05 RZ flat 4096 + +# Triggers. +axis 0x0a LTRIGGER +axis 0x09 RTRIGGER + +# Hat. +axis 0x10 HAT_X +axis 0x11 HAT_Y + +# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt + +# Action button (circle icon, left of the Home button) +key 158 BUTTON_SELECT + +# Home button (branded button in the center of the controller) +key 172 BUTTON_MODE + +# Menu button (hamburger icon, right of the Home button) +key 315 BUTTON_START + +# Alexa Push-To-Talk button (microphone icon, below the Home button) +key 217 MEDIA_RECORD |