209481c53e
1114c3c1d4cdac1943345e1abb8050412e07ab8c240044836677c561811fad7a848373ef89646bdeb12a70bbac4ad414dcaa35b4cd877e3a98634286bb114c2635390c11add34a4bc611a2b51906de10527787f3c8ffde474ad7aa87e487c4c906fe9722c69c3eecd4b2303adccc5bb05db6f7536b49768824802a832bce6dcc23683d3d5c4d382eda592b791029f28b53c01013a992c7169750efbf6bced563b6f26aad3c7d750da3180f9a868773a29b7283b3fa09cf133136b6501a01ce5f617c309c0988806ec3ef1Signed-off-by: Tad <tad@spotco.us>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From ffde474ad7e72c72367f16a231bc30ea8ee3311b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Tue, 14 May 2019 15:11:59 -0400
|
|
Subject: [PATCH] avoid AssetManager errors with exec spawning
|
|
|
|
This causes harmless errors and wastes time spawning a process that's
|
|
not going to succeed.
|
|
---
|
|
core/jni/android_util_AssetManager.cpp | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
|
|
index 2b471fec9c8f..7a29db32808d 100644
|
|
--- a/core/jni/android_util_AssetManager.cpp
|
|
+++ b/core/jni/android_util_AssetManager.cpp
|
|
@@ -125,6 +125,10 @@ constexpr inline static ApkAssetsCookie JavaCookieToApkAssetsCookie(jint cookie)
|
|
|
|
// This is called by zygote (running as user root) as part of preloadResources.
|
|
static void NativeVerifySystemIdmaps(JNIEnv* /*env*/, jclass /*clazz*/) {
|
|
+ // avoid triggering an error with exec-based spawning
|
|
+ if (getuid() != 0) {
|
|
+ return;
|
|
+ }
|
|
switch (pid_t pid = fork()) {
|
|
case -1:
|
|
PLOG(ERROR) << "failed to fork for idmap";
|