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

Commit ed12eeed authored by Eric Lin's avatar Eric Lin
Browse files

Add type annotation to the phase parameter. 

This commit adds the `@LaunchParamsModifier.Phase` annotation to the
phase parameters. This prevents accidental passing of invalid phase
values and improves readability.

BUG: 387193964
Flag: EXEMPT refactor
Test: Local build
Change-Id: Ie6b3c3f4b75a813014e648e7c3daafc0241b113e
parent b746bf0d

services/core/java/com/android/server/wm/LaunchParamsController.java

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ class LaunchParamsController { 
     * @param result    The resulting params.

     */

    void calculate(Task task, WindowLayout layout, ActivityRecord activity, ActivityRecord source,

            ActivityOptions options, @Nullable Request request, int phase, LaunchParams result) {

            ActivityOptions options, @Nullable Request request,

            @LaunchParamsModifier.Phase int phase, LaunchParams result) {

        result.reset();



        if (task != null || activity != null) {

services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java

+4 −2
Original line number Diff line number Diff line
@@ -96,9 +96,10 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
    }



    @Override

    @Result

    public int onCalculate(@Nullable Task task, @Nullable ActivityInfo.WindowLayout layout,

            @Nullable ActivityRecord activity, @Nullable ActivityRecord source,

            @Nullable ActivityOptions options, @Nullable Request request, int phase,

            @Nullable ActivityOptions options, @Nullable Request request, @Phase int phase,

            LaunchParams currentParams, LaunchParams outParams) {

        initLogBuilder(task, activity);

        final int result = calculate(task, layout, activity, source, options, request, phase,
@@ -107,9 +108,10 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
        return result;

    }



    @Result

    private int calculate(@Nullable Task task, @Nullable ActivityInfo.WindowLayout layout,

            @Nullable ActivityRecord activity, @Nullable ActivityRecord source,

            @Nullable ActivityOptions options, @Nullable Request request, int phase,

            @Nullable ActivityOptions options, @Nullable Request request, @Phase int phase,

            LaunchParams currentParams, LaunchParams outParams) {

        final ActivityRecord root;

        if (task != null) {