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

Commit f64e8887 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder freeze RPC protocol version '0'" into tm-dev am: 5d7e9601 am: eb8a9fcc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17904322



Change-Id: I612bb0a68446a9a74df1a3a7ef72662700357523
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13f5531d eb8a9fcc

libs/binder/include/binder/RpcSession.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,9 +35,9 @@ class RpcState; 
class RpcTransport;

class RpcTransport;

class FdTrigger;

class FdTrigger;





constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_NEXT = 0;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_NEXT = 1;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL = 0xF0000000;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL = 0xF0000000;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION = RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION = 0;





/**

/**

 * This represents a session (group of connections) between a client

 * This represents a session (group of connections) between a client

libs/binder/tests/binderRpcWireProtocolTest.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -237,8 +237,9 @@ TEST(RpcWire, CurrentVersion) { 
    checkRepr(kCurrentRepr, RPC_WIRE_PROTOCOL_VERSION);

    checkRepr(kCurrentRepr, RPC_WIRE_PROTOCOL_VERSION);

}

}





static_assert(RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL,

static_assert(RPC_WIRE_PROTOCOL_VERSION == 0,

              "you better update this test!");

              "If the binder wire protocol is updated, this test should test additional versions. "

              "The binder wire protocol should only be updated on upstream AOSP.");





TEST(RpcWire, ReleaseBranchHasFrozenRpcWireProtocol) {

TEST(RpcWire, ReleaseBranchHasFrozenRpcWireProtocol) {

    if (RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {

    if (RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {