diff options
| -rw-r--r-- | libs/binder/RpcState.cpp | 6 | ||||
| -rw-r--r-- | libs/binder/tests/binderRpcTestCommon.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index 26a2f4fa39..749c2f81ea 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -412,10 +412,8 @@ bool RpcState::validateProtocolVersion(uint32_t version) { return false; } #else - // TODO(b/305983144) - // don't restrict on other platforms, though experimental should - // only really be used for testing, we don't have a good way to see - // what is shipping outside of Android + ALOGE("Cannot use experimental RPC binder protocol outside of Android."); + return false; #endif } else if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT) { ALOGE("Cannot use RPC binder protocol version %u which is unknown (current protocol " diff --git a/libs/binder/tests/binderRpcTestCommon.h b/libs/binder/tests/binderRpcTestCommon.h index 786fab8133..c3070ddd14 100644 --- a/libs/binder/tests/binderRpcTestCommon.h +++ b/libs/binder/tests/binderRpcTestCommon.h @@ -74,8 +74,7 @@ static inline bool hasExperimentalRpc() { #ifdef __ANDROID__ return base::GetProperty("ro.build.version.codename", "") != "REL"; #else - // TODO(b/305983144): restrict on other platforms - return true; + return false; #endif } |