diff --git a/Android.bp b/Android.bp index 731b9f6171584..88c01e7c6395b 100644 --- a/Android.bp +++ b/Android.bp @@ -326,8 +326,12 @@ java_defaults { "error_prone_android_framework", ], required: [ + // TODO(b/120066492): remove default_television.xml when the build system + // propagates "required" properly. + "default_television.xml", "framework-platform-compat-config", - // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. + // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build + // system propagates "required" properly. "gps_debug.conf", "icu4j-platform-compat-config", "protolog.conf.json.gz", diff --git a/data/etc/displayconfig/Android.bp b/data/etc/displayconfig/Android.bp new file mode 100644 index 0000000000000..b2a45d21a4e07 --- /dev/null +++ b/data/etc/displayconfig/Android.bp @@ -0,0 +1,28 @@ +// Copyright 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. + +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: "default_television.xml", + sub_dir: "displayconfig", + src: "default_television.xml", +} diff --git a/data/etc/displayconfig/OWNERS b/data/etc/displayconfig/OWNERS new file mode 100644 index 0000000000000..6ce1ee4d3de28 --- /dev/null +++ b/data/etc/displayconfig/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/display/OWNERS diff --git a/data/etc/displayconfig/default_television.xml b/data/etc/displayconfig/default_television.xml new file mode 100644 index 0000000000000..2540f5943c206 --- /dev/null +++ b/data/etc/displayconfig/default_television.xml @@ -0,0 +1,24 @@ + + + + 480 + 720 + 120 + + + 720 + 1280 + 213 + + + 1080 + 1920 + 320 + + + 2160 + 3840 + 640 + + + diff --git a/services/core/Android.bp b/services/core/Android.bp index 9f22489f93050..9351415c1fb0a 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -137,6 +137,7 @@ java_library_static { ], required: [ + "default_television.xml", "gps_debug.conf", "protolog.conf.json.gz", ],