Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf65838 authored by Mark White's avatar Mark White Committed by Android (Google) Code Review
Browse files

Merge "AppCompat override no longer applies for WebView Zygote" into main

parents d80b5617 d937fbe2

core/java/android/os/Process.java

+1 −2
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ public class Process { 
                                                  @Nullable String invokeWith,

                                                  @Nullable String packageName,

                                                  @Nullable long[] disabledCompatChanges,

                                                  boolean bindMountSyspropOverrides,

                                                  @Nullable String[] zygoteArgs) {

        // Webview zygote can't access app private data files, so doesn't need to know its data

        // info.
@@ -767,7 +766,7 @@ public class Process { 
                    /*zygotePolicyFlags=*/ ZYGOTE_POLICY_FLAG_EMPTY, /*isTopApp=*/ false,

                disabledCompatChanges, /* pkgDataInfoMap */ null,

                /* whitelistedDataInfoMap */ null, /* bindMountAppsData */ false,

                /* bindMountAppStorageDirs */ false, bindMountSyspropOverrides, zygoteArgs);

                /* bindMountAppStorageDirs */ false, /* bindMountSyspropOverrides */ false, zygoteArgs);

    }



    /**

services/core/java/com/android/server/am/ProcessList.java

+0 −1
Original line number Diff line number Diff line
@@ -2482,7 +2482,6 @@ public final class ProcessList { 
                        app.info.targetSdkVersion, seInfo, requiredAbi, instructionSet,

                        app.info.dataDir, null, app.info.packageName,

                        app.getDisabledCompatChanges(),

                        bindOverrideSysprops,

                        new String[]{PROC_START_SEQ_IDENT + app.getStartSeq()});

            } else if (hostingRecord.usesAppZygote()) {

                final AppZygote appZygote = createAppZygoteForProcessIfNeeded(app);