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

Commit 55e3c260 authored by Matthew Sedam's avatar Matthew Sedam
Browse files

ContextHubClient: Disallow reliable broadcast messages 

This CL also cleans up a null-@NonNull discrepancy.

Bug: 333567700
Change-Id: I9b572c81be2153f4fb54efa8171d37765a27b46f
Test: Presubmits
parent ef9f1d6e

core/java/android/hardware/location/ContextHubClient.java

+3 −5
Original line number Original line Diff line number Diff line
@@ -205,14 +205,12 @@ public class ContextHubClient implements Closeable { 
    @FlaggedApi(Flags.FLAG_RELIABLE_MESSAGE)

    @FlaggedApi(Flags.FLAG_RELIABLE_MESSAGE)

    public ContextHubTransaction<Void> sendReliableMessageToNanoApp(

    public ContextHubTransaction<Void> sendReliableMessageToNanoApp(

            @NonNull NanoAppMessage message) {

            @NonNull NanoAppMessage message) {

        if (!Flags.reliableMessageImplementation()) {

            return null;

        }



        ContextHubTransaction<Void> transaction =

        ContextHubTransaction<Void> transaction =

                new ContextHubTransaction<>(ContextHubTransaction.TYPE_RELIABLE_MESSAGE);

                new ContextHubTransaction<>(ContextHubTransaction.TYPE_RELIABLE_MESSAGE);





        if (!mAttachedHub.supportsReliableMessages()) {

        if (!Flags.reliableMessageImplementation() ||

            !mAttachedHub.supportsReliableMessages() ||

            message.isBroadcastMessage()) {

            transaction.setResponse(new ContextHubTransaction.Response<Void>(

            transaction.setResponse(new ContextHubTransaction.Response<Void>(

                    ContextHubTransaction.RESULT_FAILED_NOT_SUPPORTED, null));

                    ContextHubTransaction.RESULT_FAILED_NOT_SUPPORTED, null));

            return transaction;

            return transaction;