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

Commit b964f249 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Initialize ProtoLog once on first activity launch 

Fixes an IllegalStateException crash caused by using ProtoLog before it
was initialized. This could happen in UI processes where logging code
was called during the activity lifecycle before ProtoLog.start() was
invoked.

This change moves the initialization to handleLaunchActivity(), ensuring
it runs in processes that have a UI. A static boolean,
sProtoLogInitialized, is used to guarantee that the initialization
occurs only once per process, on the first activity launch.

The ProtoLog initialization here will be guarded by a flag to roll out
gradually and safely.

Bug: 432646252
Flag: android.tracing.imetracker_protolog
Change-Id: Ia9160a26702550d7bc7ef6a0c2e1e7e4f4cdf490
parent 06e27907

core/java/android/app/ActivityThread.java

+6 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ import com.android.internal.os.SafeZipPathValidatorCallback; 
import com.android.internal.os.SomeArgs;

import com.android.internal.os.logging.MetricsLoggerWrapper;

import com.android.internal.policy.DecorView;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.Preconditions;
@@ -4629,6 +4630,11 @@ public final class ActivityThread extends ClientTransactionHandler 
                HardwareRenderer.preload();

            }

        }



        if (android.tracing.Flags.imetrackerProtolog()) {

            ProtoLog.init();

        }



        WindowManagerGlobal.initialize();



        // Hint the GraphicsEnvironment that an activity is launching on the process.