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

Commit 11047257 authored by Marin Shalamanov's avatar Marin Shalamanov
Browse files

Add default display config for television 

Fixes: 207331094
Ignore-AOSP-First: Owners file aded for a new folder
    which doesn't exist on AOSP
Test: adb shell dumpsys display | grep DensityMap
Change-Id: Ia46004fa8e41bb24b16a660f12873c9f9a93b6a4
parent a822ccd7

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -324,8 +324,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",

data/etc/displayconfig/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
// 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",

}

data/etc/displayconfig/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /services/core/java/com/android/server/display/OWNERS

data/etc/displayconfig/default_television.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<displayConfiguration>

    <densityMap>

         <density>

            <height>480</height>

            <width>720</width>

            <density>120</density>

         </density>

         <density>

            <height>720</height>

            <width>1280</width>

            <density>213</density>

         </density>

         <density>

            <height>1080</height>

            <width>1920</width>

            <density>320</density>

         </density>

         <density>

            <height>2160</height>

            <width>3840</width>

            <density>640</density>

         </density>

    </densityMap>

</displayConfiguration>

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ java_library_static { 
    ],



    required: [

        "default_television.xml",

        "gps_debug.conf",

        "protolog.conf.json.gz",

    ],