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

Commit b6bba25d authored by Mark Fasheh's avatar Mark Fasheh
Browse files

frameworks: fully locked custom heap based MessageQueue 

Flag: build.RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION
Test: atest MessageQueueTest
Test: boot phone and use it
Bug: 336880969
Change-Id: I96e5a36636468ef2e6eb9e1fd797efcc7af051a9
parent a5ac6b8e

core/java/Android.bp

+2 −4
Original line number Original line Diff line number Diff line
@@ -22,11 +22,9 @@ filegroup { 
        ":framework-nfc-non-updatable-sources",

        ":framework-nfc-non-updatable-sources",

        ":messagequeue-gen",

        ":messagequeue-gen",

    ],

    ],

    // Exactly one of the below will be added to srcs by messagequeue-gen

    // Exactly one MessageQueue.java will be added to srcs by messagequeue-gen

    exclude_srcs: [

    exclude_srcs: [

        "android/os/LegacyMessageQueue/MessageQueue.java",

        "android/os/*MessageQueue/**/*.java",

        "android/os/ConcurrentMessageQueue/MessageQueue.java",

        "android/os/SemiConcurrentMessageQueue/MessageQueue.java",

    ],

    ],

    visibility: ["//frameworks/base"],

    visibility: ["//frameworks/base"],

}

}

core/java/android/os/ConcurrentMessageQueue/MessageQueue.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ public final class MessageQueue { 
    private volatile long mNextInsertSeqValue = 0;

    private volatile long mNextInsertSeqValue = 0;

    /*

    /*

     * The exception to the FIFO order rule is sendMessageAtFrontOfQueue().

     * The exception to the FIFO order rule is sendMessageAtFrontOfQueue().

     * Those messages must be in LIFO order - SIGH.

     * Those messages must be in LIFO order.

     * Decrements on each front of queue insert.

     * Decrements on each front of queue insert.

     */

     */

    private static final VarHandle sNextFrontInsertSeq;

    private static final VarHandle sNextFrontInsertSeq;

core/java/android/os/LockedMessageQueue/MessageQueue.java

0 → 100644
+1351 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/os/Message.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,10 @@ public final class Message implements Parcelable { 
    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public long when;

    public long when;





    /** @hide */

    @SuppressWarnings("unused")

    public long mInsertSeq;



    /*package*/ Bundle data;

    /*package*/ Bundle data;





    @UnsupportedAppUsage

    @UnsupportedAppUsage

core/java/android/os/SemiConcurrentMessageQueue/MessageQueue.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ public final class MessageQueue { 
    private volatile long mNextInsertSeqValue = 0;

    private volatile long mNextInsertSeqValue = 0;

    /*

    /*

     * The exception to the FIFO order rule is sendMessageAtFrontOfQueue().

     * The exception to the FIFO order rule is sendMessageAtFrontOfQueue().

     * Those messages must be in LIFO order - SIGH.

     * Those messages must be in LIFO order.

     * Decrements on each front of queue insert.

     * Decrements on each front of queue insert.

     */

     */

    private static final VarHandle sNextFrontInsertSeq;

    private static final VarHandle sNextFrontInsertSeq;