commit c4eb4a8ac9fea098e5f12490d9b5d5f2d860abb3
author Wayne Ma <waynema@google.com> Fri Feb 18 11:23:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 18 11:23:57 2022 +0000
tree 2095e65bd5e7af898d7844579c5f412c18671d2e
parent c7ec0f485e09593a1ef8c885f0c9cc4f815ce189
parent a9bcf7eb012369f9535ca71e370f17d8ecfadb37

Address comment from aosp/1948169 am: 5545291ef5 am: c6f0c0287b am: a9bcf7eb01

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991613

Change-Id: I3658db08aa27c0e90efd582752f602ef089ba4bb

service/jni/com_android_server_BpfNetMaps.cpp

diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp
index 63961cb..f13c68d 100644
--- a/service/jni/com_android_server_BpfNetMaps.cpp
+++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -109,6 +109,7 @@
     }
 
     size_t size = uids.size();
+    static_assert(sizeof(*(uids.get())) == sizeof(int32_t));
     std::vector<int32_t> data ((int32_t *)&uids[0], (int32_t*)&uids[size]);
     int res = mTc.replaceUidOwnerMap(chainName, isAllowlist, data);
     if (res) {
@@ -145,6 +146,7 @@
     }
 
     size_t size = uids.size();
+    static_assert(sizeof(*(uids.get())) == sizeof(int32_t));
     std::vector<int32_t> data ((int32_t *)&uids[0], (int32_t*)&uids[size]);
     Status status = mTc.addUidInterfaceRules(ifIndex, data);
     if (!isOk(status)) {
@@ -160,6 +162,7 @@
     }
 
     size_t size = uids.size();
+    static_assert(sizeof(*(uids.get())) == sizeof(int32_t));
     std::vector<int32_t> data ((int32_t *)&uids[0], (int32_t*)&uids[size]);
     Status status = mTc.removeUidInterfaceRules(data);
     if (!isOk(status)) {