| commit | 00e4ba9679dde43ce65814552c3213161c7a774e | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue May 02 17:48:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 02 17:48:40 2023 +0000 |
| tree | dd7d0ccd4cb2dc8ba7d990a008329bdb247b4b0f | |
| parent | 0f9cc3de787f884acbd8c11b292cfeb33130fd9f [diff] | |
| parent | e0025809dfa9731a3478879113c426b65e521829 [diff] |
clarify comment about uid check on abort() am: 9461bb1f48 am: e0025809df Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2576230 Change-Id: I6186de7f845c2afe02cea1fb19235ceb370db212 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp index 77cffda..9ced44e 100644 --- a/service/jni/com_android_server_BpfNetMaps.cpp +++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -54,6 +54,10 @@ if (!isOk(status)) { uid_t uid = getuid(); ALOGE("BpfNetMaps jni init failure as uid=%d", uid); + // We probably only ever get called from system_server (ie. AID_SYSTEM) + // or from tests, and never from network_stack (ie. AID_NETWORK_STACK). + // However, if we ever do add calls from production network_stack code + // we do want to make sure this initializes correctly. // TODO: Fix tests to not use this jni lib, so we can unconditionally abort() if (uid == AID_SYSTEM || uid == AID_NETWORK_STACK) abort(); }