Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f7d24d24: Merge "PreInitializeNativeBridge only if its Available"

Browse Source 
* commit 'f7d24d244319599f62c22e29c3e6540d6cbadf49':
  PreInitializeNativeBridge only if its Available
This commit is contained in:
Calin Juravle
2014-10-28 19:28:42 +00:00
committed by Android Git Automerger
parent 87ce99ca72 f7d24d2443
commit 5d4deb8246
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -418,6 +418,10 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
pid_t pid = fork();
if (pid == 0) {
if (!is_system_server && dataDir == NULL) {
ALOGE("Application private dir cannot be null");
RuntimeAbort(env);
}
// The child process.
gMallocLeakZygoteChild = 1;
@@ -431,13 +435,14 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
DropCapabilitiesBoundingSet(env);
bool need_native_bridge = false;
if (instructionSet != NULL) {
bool use_native_bridge = !is_system_server && (instructionSet != NULL)
&& android::NativeBridgeAvailable();
if (use_native_bridge) {
ScopedUtfChars isa_string(env, instructionSet);
need_native_bridge = android::NeedsNativeBridge(isa_string.c_str());
use_native_bridge = android::NeedsNativeBridge(isa_string.c_str());
}
if (!MountEmulatedStorage(uid, mount_external, need_native_bridge)) {
if (!MountEmulatedStorage(uid, mount_external, use_native_bridge)) {
ALOGW("Failed to mount emulated storage: %s", strerror(errno));
if (errno == ENOTCONN || errno == EROFS) {
// When device is actively encrypting, we get ENOTCONN here
@@ -466,15 +471,10 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
SetRLimits(env, javaRlimits);
if (!is_system_server && need_native_bridge) {
// Set the environment for the apps running with native bridge.
ScopedUtfChars isa_string(env, instructionSet); // Known non-null because of need_native_...
if (dataDir == NULL) {
android::PreInitializeNativeBridge(NULL, isa_string.c_str());
} else {
ScopedUtfChars data_dir(env, dataDir);
android::PreInitializeNativeBridge(data_dir.c_str(), isa_string.c_str());
}
if (use_native_bridge) {
ScopedUtfChars isa_string(env, instructionSet);
ScopedUtfChars data_dir(env, dataDir);
android::PreInitializeNativeBridge(data_dir.c_str(), isa_string.c_str());
}
int rc = setresgid(gid, gid, gid);