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

Commit 5c0bf35e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13219462 from 913c8f38 to 25Q2-release 

Change-Id: I3646086d14aef11ed895a12583c0b9c7873ec222
parents a8d69a44 913c8f38

libs/binder/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -277,15 +277,6 @@ cc_defaults { 
        "-fvisibility=hidden",

        "-DBUILDING_LIBBINDER",

    ],



    target: {

        vendor: {

            // Trimming the exported symbols reveals a bug in vendor code, so

            // disable it for the vendor variant for now. http://b/349657329

            // TODO: Fix the issue and remove this override.

            cflags: ["-fvisibility=default"],

        },

    },

}



cc_defaults {

libs/binder/rust/src/binder.rs

+6 −0
Original line number Diff line number Diff line
@@ -1160,6 +1160,12 @@ macro_rules! declare_binder_enum { 
            pub const fn enum_values() -> [Self; $size] {

                [$(Self::$name),*]

            }



            #[inline(always)]

            #[allow(missing_docs)]

            pub const fn get(&self) -> $backing {

                self.0

            }

        }



        impl std::fmt::Debug for $enum {

libs/gui/SurfaceComposerClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2546,6 +2546,7 @@ status_t SurfaceComposerClient::getStaticDisplayInfo(int64_t displayId, 
    if (status.isOk()) {

        // convert gui::StaticDisplayInfo to ui::StaticDisplayInfo

        outInfo->connectionType = static_cast<ui::DisplayConnectionType>(ginfo.connectionType);

        outInfo->port = ginfo.port;

        outInfo->density = ginfo.density;

        outInfo->secure = ginfo.secure;

        outInfo->installOrientation = static_cast<ui::Rotation>(ginfo.installOrientation);

libs/gui/aidl/android/gui/StaticDisplayInfo.aidl

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.gui.Rotation; 
/** @hide */

parcelable StaticDisplayInfo {

    DisplayConnectionType connectionType = DisplayConnectionType.Internal;

    int port = -1;

    float density;

    boolean secure;

    @nullable DeviceProductInfo deviceProductInfo;

libs/gui/libgui_flags.aconfig

+0 −3
Original line number Diff line number Diff line
@@ -130,9 +130,6 @@ flag { 
  description: "Remove BufferQueueProducer::dequeue's wait on this fence (or the fence entirely) to prevent deadlocks"

  bug: "339705065"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

} # bq_gl_fence_cleanup



flag {