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

Commit 0d53efc5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5485752 from bc703749 to qt-release

Change-Id: Idf433cdf214cf175a3c8cbba7abaeb59a7208dab
parents 4b8d0605 bc703749
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ on late-init
    chmod 0666 /sys/kernel/tracing/events/sched/sched_cpu_hotplug/enable
    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_pi_setprio/enable
    chmod 0666 /sys/kernel/tracing/events/sched/sched_pi_setprio/enable
    chmod 0666 /sys/kernel/debug/tracing/events/sched/sched_waking/enable
    chmod 0666 /sys/kernel/tracing/events/sched/sched_waking/enable
    chmod 0666 /sys/kernel/debug/tracing/events/cgroup/enable
    chmod 0666 /sys/kernel/tracing/events/cgroup/enable
    chmod 0666 /sys/kernel/debug/tracing/events/power/cpu_frequency/enable
+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@
 * limitations under the License.
 */

/**
 * @addtogroup Font
 * {
 */

/**
 * @file font.h
 * @brief Provides some constants used in system_fonts.h or fonts_matcher.h
@@ -279,3 +284,5 @@ float AFont_getAxisValue(const AFont* _Nonnull font, uint32_t axisIndex)
__END_DECLS

#endif // ANDROID_FONT_H

/** @} */
+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@
 * limitations under the License.
 */

/**
 * @addtogroup Font
 * {
 */

/**
 * @file font_matcher.h
 * @brief Provides the font matching logic with various inputs.
@@ -205,3 +210,5 @@ AFont* _Nonnull AFontMatcher_match(
__END_DECLS

#endif // ANDROID_FONT_MATCHER_H

/** @} */
+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@
 * limitations under the License.
 */

/**
 * @addtogroup Font
 * {
 */

/**
 * @file system_fonts.h
 * @brief Provides the system font configurations.
@@ -122,3 +127,5 @@ AFont* _Nullable ASystemFontIterator_next(ASystemFontIterator* _Nonnull iterator
__END_DECLS

#endif // ANDROID_SYSTEM_FONTS_H

/** @} */
+6 −6
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public:
                                     const sp<IBinder>& applyToken,
                                     const InputWindowCommands& commands,
                                     int64_t desiredPresentTime,
                                     const cached_buffer_t& uncacheBuffer,
                                     const client_cache_t& uncacheBuffer,
                                     const std::vector<ListenerCallbacks>& listenerCallbacks) {
        Parcel data, reply;
        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
@@ -88,8 +88,8 @@ public:
        data.writeStrongBinder(applyToken);
        commands.write(data);
        data.writeInt64(desiredPresentTime);
        data.writeStrongBinder(uncacheBuffer.token);
        data.writeUint64(uncacheBuffer.cacheId);
        data.writeWeakBinder(uncacheBuffer.token);
        data.writeUint64(uncacheBuffer.id);

        if (data.writeVectorSize(listenerCallbacks) == NO_ERROR) {
            for (const auto& [listener, callbackIds] : listenerCallbacks) {
@@ -991,9 +991,9 @@ status_t BnSurfaceComposer::onTransact(

            int64_t desiredPresentTime = data.readInt64();

            cached_buffer_t uncachedBuffer;
            uncachedBuffer.token = data.readStrongBinder();
            uncachedBuffer.cacheId = data.readUint64();
            client_cache_t uncachedBuffer;
            uncachedBuffer.token = data.readWeakBinder();
            uncachedBuffer.id = data.readUint64();

            std::vector<ListenerCallbacks> listenerCallbacks;
            int32_t listenersSize = data.readInt32();
Loading