From ad558f99b8300f2ebae54ed91eb320bd2a99f38d Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Thu, 17 Feb 2022 18:34:27 +0000 Subject: [PATCH] Revert "Disable per-process app class to investigate" Revert "Disable per-process app class to investigate (disabling CTS)" Revert submission 16804724-disable-per-proc-app Reason for revert: The revert has reached weekly. Now I'll revert it to see what change it made. Reverted Changes: I87f16857b:Disable per-process app class to investigate I87f16857b:Disable per-process app class to investigate (disa... Change-Id: Ib84035c7819acc347e0bbba8bfada66300778c63 Test: treehugger Bug: 185177290 --- core/java/android/app/LoadedApk.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 77c7c6f80f0ee..99a523a0e18a1 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -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"; }