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

Commit dc21a79c authored by Gavin Corkery's avatar Gavin Corkery Committed by Android (Google) Code Review
Browse files

Merge "Make ActivityContextInfo.CONTEXT_FLAGS a method instead of a constant" into main

parents 861eaf12 a8c4de6b

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -4077,7 +4077,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        final LoadedApk sdkApk = getPackageInfo(

                contextInfo.getSdkApplicationInfo(),

                r.packageInfo.getCompatibilityInfo(),

                ActivityContextInfo.CONTEXT_FLAGS);

                contextInfo.getContextFlags());



        final ContextImpl activityContext = ContextImpl.createActivityContext(

                this, sdkApk, r.activityInfo, r.token, displayId, r.overrideConfig);