From 5545291ef53591d4c06d758c02db1238053dad2d Mon Sep 17 00:00:00 2001 From: Wayne Ma Date: Fri, 18 Feb 2022 14:09:04 +0800 Subject: [PATCH] Address comment from aosp/1948169 Bug: 202086915 Test: m; flash; boot; Change-Id: I9bd627cc4ec77e1ab6da3e3acc7d4d8bba7d43de --- service/jni/com_android_server_BpfNetMaps.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp index 63961cb283..f13c68d310 100644 --- a/service/jni/com_android_server_BpfNetMaps.cpp +++ b/service/jni/com_android_server_BpfNetMaps.cpp @@ -109,6 +109,7 @@ static jint native_replaceUidChain(JNIEnv* env, jobject clazz, jstring name, jbo } size_t size = uids.size(); + static_assert(sizeof(*(uids.get())) == sizeof(int32_t)); std::vector data ((int32_t *)&uids[0], (int32_t*)&uids[size]); int res = mTc.replaceUidOwnerMap(chainName, isAllowlist, data); if (res) { @@ -145,6 +146,7 @@ static jint native_addUidInterfaceRules(JNIEnv* env, jobject clazz, jstring ifNa } size_t size = uids.size(); + static_assert(sizeof(*(uids.get())) == sizeof(int32_t)); std::vector data ((int32_t *)&uids[0], (int32_t*)&uids[size]); Status status = mTc.addUidInterfaceRules(ifIndex, data); if (!isOk(status)) { @@ -160,6 +162,7 @@ static jint native_removeUidInterfaceRules(JNIEnv* env, jobject clazz, jintArray } size_t size = uids.size(); + static_assert(sizeof(*(uids.get())) == sizeof(int32_t)); std::vector data ((int32_t *)&uids[0], (int32_t*)&uids[size]); Status status = mTc.removeUidInterfaceRules(data); if (!isOk(status)) {