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

Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

Browse Source
This commit is contained in:
Calin Juravle
2014-10-29 15:48:11 +00:00
committed by Android (Google) Code Review
parent 5b0f193d25 e11952ecd5
commit ef0a7e8fdb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -436,10 +436,6 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
pid_t pid = fork(); pid_t pid = fork();
if (pid == 0) { if (pid == 0) {
if (!is_system_server && dataDir == NULL) {
ALOGE("Application private dir cannot be null");
RuntimeAbort(env);
}
// The child process. // The child process.
gMallocLeakZygoteChild = 1; gMallocLeakZygoteChild = 1;
@@ -462,6 +458,14 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
ScopedUtfChars isa_string(env, instructionSet); ScopedUtfChars isa_string(env, instructionSet);
use_native_bridge = android::NeedsNativeBridge(isa_string.c_str()); use_native_bridge = android::NeedsNativeBridge(isa_string.c_str());
} }
if (use_native_bridge && dataDir == NULL) {
// dataDir should never be null if we need to use a native bridge.
// In general, dataDir will never be null for normal applications. It can only happen in
// special cases (for isolated processes which are not associated with any app). These are
// launched by the framework and should not be emulated anyway.
use_native_bridge = false;
ALOGW("Native bridge will not be used because dataDir == NULL.");
}
if (!MountEmulatedStorage(uid, mount_external, use_native_bridge)) { if (!MountEmulatedStorage(uid, mount_external, use_native_bridge)) {
ALOGW("Failed to mount emulated storage: %s", strerror(errno)); ALOGW("Failed to mount emulated storage: %s", strerror(errno));