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

Commit 5d7e9601 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libbinder freeze RPC protocol version '0'" into tm-dev

parents cd6ebf35 46297629

libs/binder/include/binder/RpcSession.h

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

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 = RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL;

constexpr uint32_t RPC_WIRE_PROTOCOL_VERSION = 0;



/**

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

libs/binder/tests/binderRpcWireProtocolTest.cpp

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

}



static_assert(RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL,

              "you better update this test!");

static_assert(RPC_WIRE_PROTOCOL_VERSION == 0,

              "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) {

    if (RPC_WIRE_PROTOCOL_VERSION == RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {