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

Commit 61c1f462 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12L 

Bug: 222710654
Merged-In: I10f5fcb9874bed209a70e61db875afcf6d7c9795
Change-Id: I0cf7b9d77ca9818dbfa1b737ad56a4dade9b22c3
parents 989e5479 95409114

cmds/surfacereplayer/proto/src/trace.proto

+6 −1
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ message LayerStackChange { 
    required uint32 layer_stack = 1;

}



message DisplayFlagsChange {

    required uint32 flags = 1;

}



message HiddenFlagChange {

    required bool hidden_flag = 1;

}
@@ -121,6 +125,7 @@ message DisplayChange { 
        LayerStackChange  layer_stack = 3;

        SizeChange        size        = 4;

        ProjectionChange  projection  = 5;

        DisplayFlagsChange flags      = 6;

    }

}

data/etc/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -255,3 +255,11 @@ prebuilt_etc { 
    src: "handheld_core_hardware.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.app_compat_overrides.xml",

    product_specific: true,

    sub_dir: "permissions",

    src: "android.software.app_compat_overrides.xml",

    filename_from_src: true,

}

data/etc/android.software.app_compat_overrides.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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.

-->



<!-- Feature for devices that are opted-in to receive per-app compatibility

     overrides. -->

<permissions>

  <feature name="android.software.app_compat_overrides" />

</permissions>

include/input/Flags.h→include/ftl/Flags.h

+2 −5
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
#include <string>

#include <type_traits>



#include "NamedEnum.h"

#include <ftl/NamedEnum.h>

#include "utils/BitSet.h"



#ifndef __UI_INPUT_FLAGS_H

#define __UI_INPUT_FLAGS_H

#pragma once



namespace android {
@@ -279,5 +278,3 @@ Flags<F> operator|(F lhs, F rhs) { 


} // namespace flag_operators

} // namespace android
 


#endif // __UI_INPUT_FLAGS_H

include/input/NamedEnum.h→include/ftl/NamedEnum.h

+1 −4
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include <optional>

#include <string>



#ifndef __UI_INPUT_NAMEDENUM_H

#define __UI_INPUT_NAMEDENUM_H

#pragma once



namespace android {
@@ -128,5 +127,3 @@ public: 
};



} // namespace android
 


#endif // __UI_INPUT_NAMEDENUM_H
 
 No newline at end of file