diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/etc/Android.bp | 9 | ||||
| -rw-r--r-- | data/etc/OWNERS | 4 | ||||
| -rw-r--r-- | data/etc/car/Android.bp | 9 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 13 | ||||
| -rw-r--r-- | data/fonts/Android.bp | 17 | ||||
| -rw-r--r-- | data/keyboards/Android.mk | 3 | ||||
| -rw-r--r-- | data/keyboards/Vendor_0957_Product_0001.idc | 23 | ||||
| -rw-r--r-- | data/keyboards/Vendor_0957_Product_0001.kl | 72 |
8 files changed, 149 insertions, 1 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index fb8b17c1f159..d0e247450033 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -15,6 +15,15 @@ // Sysconfig files +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + prebuilt_etc { name: "framework-sysconfig.xml", sub_dir: "sysconfig", diff --git a/data/etc/OWNERS b/data/etc/OWNERS index 5efd0bd06b74..549e074d297c 100644 --- a/data/etc/OWNERS +++ b/data/etc/OWNERS @@ -1,3 +1,4 @@ +alanstokes@google.com cbrubaker@google.com hackbod@android.com hackbod@google.com @@ -5,9 +6,10 @@ jeffv@google.com jsharkey@android.com jsharkey@google.com lorenzo@google.com -moltmann@google.com svetoslavganov@android.com svetoslavganov@google.com toddke@android.com toddke@google.com yamasani@google.com + +per-file preinstalled-packages* = file:/MULTIUSER_OWNERS diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp index 5010c537a66e..4181163610ec 100644 --- a/data/etc/car/Android.bp +++ b/data/etc/car/Android.bp @@ -16,6 +16,15 @@ // Privapp permission whitelist files +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + prebuilt_etc { name: "privapp_whitelist_android.car.cluster.loggingrenderer", sub_dir: "permissions", diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 1d6355c318ec..692a90e329e8 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -345,6 +345,8 @@ applications that come with the platform <permission name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.MOVE_PACKAGE"/> + <!-- Needed for test only --> + <permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/> <permission name="android.permission.OBSERVE_APP_USAGE"/> <permission name="android.permission.NETWORK_SCAN"/> <permission name="android.permission.PACKAGE_USAGE_STATS" /> @@ -440,6 +442,13 @@ applications that come with the platform <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> <!-- Permissions required for CTS test - CtsHdmiCecHostTestCases --> <permission name="android.permission.HDMI_CEC"/> + <!-- 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 required for GTS test - GtsAssistIntentTestCases --> + <permission name="android.permission.MANAGE_SOUND_TRIGGER" /> + <permission name="android.permission.CAPTURE_AUDIO_HOTWORD" /> + <permission name="android.permission.MODIFY_QUIET_MODE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> @@ -449,8 +458,12 @@ applications that come with the platform <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"> diff --git a/data/fonts/Android.bp b/data/fonts/Android.bp index 3a3bea43ab86..f0d750ef30e9 100644 --- a/data/fonts/Android.bp +++ b/data/fonts/Android.bp @@ -12,6 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["frameworks_base_data_fonts_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "frameworks_base_data_fonts_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + prebuilt_font { name: "DroidSansMono.ttf", src: "DroidSansMono.ttf", diff --git a/data/keyboards/Android.mk b/data/keyboards/Android.mk index 7949c77ab558..6ae88007f0f5 100644 --- a/data/keyboards/Android.mk +++ b/data/keyboards/Android.mk @@ -22,6 +22,9 @@ include $(LOCAL_PATH)/common.mk include $(CLEAR_VARS) LOCAL_MODULE := validate_framework_keymaps +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE intermediates := $(call intermediates-dir-for,ETC,$(LOCAL_MODULE),,COMMON) LOCAL_BUILT_MODULE := $(intermediates)/stamp diff --git a/data/keyboards/Vendor_0957_Product_0001.idc b/data/keyboards/Vendor_0957_Product_0001.idc new file mode 100644 index 000000000000..e1f4346369f3 --- /dev/null +++ b/data/keyboards/Vendor_0957_Product_0001.idc @@ -0,0 +1,23 @@ +# 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. + +# +# Input Device Configuration file for Google Reference RCU Remote. +# +# + +# Basic Parameters +keyboard.layout = Vendor_0957_Product_0001 +keyboard.characterMap = Vendor_0957_Product_0001 +audio.mic = 1
\ No newline at end of file diff --git a/data/keyboards/Vendor_0957_Product_0001.kl b/data/keyboards/Vendor_0957_Product_0001.kl new file mode 100644 index 000000000000..e9f4f2880c91 --- /dev/null +++ b/data/keyboards/Vendor_0957_Product_0001.kl @@ -0,0 +1,72 @@ +# 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. + +# +# Key Layout file for Google Reference RCU Remote. +# + +key 116 POWER WAKE +key 217 ASSIST WAKE + +key 103 DPAD_UP +key 108 DPAD_DOWN +key 105 DPAD_LEFT +key 106 DPAD_RIGHT +key 353 DPAD_CENTER + +key 158 BACK +key 172 HOME WAKE + +key 113 VOLUME_MUTE +key 114 VOLUME_DOWN +key 115 VOLUME_UP + +key 2 1 +key 3 2 +key 4 3 +key 5 4 +key 6 5 +key 7 6 +key 8 7 +key 9 8 +key 10 9 +key 11 0 + +# custom keys +key usage 0x000c01BB TV_INPUT +key usage 0x000c022A BOOKMARK +key usage 0x000c0096 SETTINGS +key usage 0x000c0097 NOTIFICATION +key usage 0x000c008D GUIDE +key usage 0x000c0089 TV +key usage 0x000c009C CHANNEL_UP +key usage 0x000c009D CHANNEL_DOWN +key usage 0x000c00CD MEDIA_PLAY_PAUSE +key usage 0x000c00B4 MEDIA_SKIP_BACKWARD +key usage 0x000c00B3 MEDIA_SKIP_FORWARD +key usage 0x000c0226 MEDIA_STOP + +key usage 0x000c0077 BUTTON_3 WAKE #YouTube +key usage 0x000c0078 BUTTON_4 WAKE #Netflix +key usage 0x000c0079 BUTTON_6 WAKE #Disney+ +key usage 0x000c007A BUTTON_7 WAKE #HBOmax + +key usage 0x000c01BD INFO +key usage 0x000c0061 CAPTIONS +key usage 0x000c0185 TV_TELETEXT + +key usage 0x000c0069 PROG_RED +key usage 0x000c006A PROG_GREEN +key usage 0x000c006B PROG_BLUE +key usage 0x000c006C PROG_YELLOW
\ No newline at end of file |