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

Commit 1f8a1160 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Disable per-process app class to investigate"" into tm-dev am: 22c4239c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988387

Change-Id: Ia127feb2f03526e6225d1385ee22f43217370d54
parents fd2f4a3b 22c4239c

core/java/android/app/LoadedApk.java

+4 −6
Original line number Diff line number Diff line
@@ -1377,18 +1377,16 @@ public final class LoadedApk { 
                    Slog.wtf(TAG, "App instance already created for package=" + mPackageName

                            + " instance=" + cached);

                }

                // TODO Return the cached one, unless it's for the wrong user?

                // TODO Return the cached one, unles it's for the wrong user?

                // For now, we just add WTF checks.

            }

        }



        Application app = null;



        // Temporarily disable per-process app class to investigate b/185177290

//        final String myProcessName = Process.myProcessName();

//        String appClass = mApplicationInfo.getCustomApplicationClassNameForProcess(

//                myProcessName);

        String appClass = mApplicationInfo.className;

        final String myProcessName = Process.myProcessName();

        String appClass = mApplicationInfo.getCustomApplicationClassNameForProcess(

                myProcessName);

        if (forceDefaultAppClass || (appClass == null)) {

            appClass = "android.app.Application";

        }