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

Merge "Avoid using usap when wrap property set." into qt-dev

Browse Source
This commit is contained in:
Christopher Ferris
2019-06-01 00:07:29 +00:00
committed by Android (Google) Code Review
parent d7673a30d9 6db1108ddc
commit cbd4908c9f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/ZygoteProcess.java
View File

@@ -407,7 +407,7 @@ public class ZygoteProcess {
*/
String msgStr = args.size() + "\n" + String.join("\n", args) + "\n";
if (useUsapPool && mUsapPoolEnabled && isValidUsapCommand(args)) {
if (useUsapPool && mUsapPoolEnabled && canAttemptUsap(args)) {
try {
return attemptUsapSendArgsAndGetResult(zygoteState, msgStr);
} catch (IOException ex) {
@@ -498,13 +498,21 @@ public class ZygoteProcess {
* @param args Zygote/USAP command arguments
* @return True if the command can be passed to a USAP; false otherwise
*/
private static boolean isValidUsapCommand(ArrayList<String> args) {
private static boolean canAttemptUsap(ArrayList<String> args) {
for (String flag : args) {
for (String badFlag : INVALID_USAP_FLAGS) {
if (flag.startsWith(badFlag)) {
return false;
}
}
if (flag.startsWith("--nice-name=")) {
// Check if the wrap property is set, usap would ignore it.
String niceName = flag.substring(12);
String property_value = SystemProperties.get("wrap." + niceName);
if (property_value != null && property_value.length() != 0) {
return false;
}
}
}
return true;