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

Commit 9ddc976d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "RPC Binder: limit experimental wire protocol use" into main

parents f310305e 687728e4

libs/binder/RpcState.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -412,10 +412,8 @@ bool RpcState::validateProtocolVersion(uint32_t version) { 
            return false;

            return false;

        }

        }

#else

#else

        // TODO(b/305983144)

        ALOGE("Cannot use experimental RPC binder protocol outside of Android.");

        // don't restrict on other platforms, though experimental should

        return false;

        // only really be used for testing, we don't have a good way to see

        // what is shipping outside of Android

#endif

#endif

    } else if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT) {

    } else if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT) {

        ALOGE("Cannot use RPC binder protocol version %u which is unknown (current protocol "

        ALOGE("Cannot use RPC binder protocol version %u which is unknown (current protocol "

libs/binder/tests/binderRpcTestCommon.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -74,8 +74,7 @@ static inline bool hasExperimentalRpc() { 
#ifdef __ANDROID__

#ifdef __ANDROID__

    return base::GetProperty("ro.build.version.codename", "") != "REL";

    return base::GetProperty("ro.build.version.codename", "") != "REL";

#else

#else

    // TODO(b/305983144): restrict on other platforms

    return false;

    return true;

#endif

#endif

}

}