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

Commit f62a0e11 authored by Jernej Virag's avatar Jernej Virag Committed by Android (Google) Code Review
Browse files

Merge "Fix @Nullability mismatch with PipTransition" into udc-qpr-dev

parents ca88ae4d c4619220

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/Pip1Module.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package com.android.wm.shell.dagger.pip;

package com.android.wm.shell.dagger.pip;





import android.annotation.Nullable;

import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.Handler;
@@ -229,7 +228,6 @@ public abstract class Pip1Module { 




    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    @Nullable

    static PipTransition providePipTransition(Context context,

    static PipTransition providePipTransition(Context context,

            ShellInit shellInit, ShellTaskOrganizer shellTaskOrganizer, Transitions transitions,

            ShellInit shellInit, ShellTaskOrganizer shellTaskOrganizer, Transitions transitions,

            PipAnimationController pipAnimationController, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipAnimationController pipAnimationController, PipBoundsAlgorithm pipBoundsAlgorithm,

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/pip/PipModule.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -36,10 +36,13 @@ import dagger.Provides; 
public abstract class PipModule {

public abstract class PipModule {

    @WMSingleton

    @WMSingleton

    @Provides

    @Provides

    @Nullable

    static PipTransitionController providePipTransitionController(

    static PipTransitionController providePipTransitionController(

            com.android.wm.shell.pip.PipTransition legacyPipTransition,

            com.android.wm.shell.pip.PipTransition legacyPipTransition,

            com.android.wm.shell.pip2.PipTransition newPipTransition) {

            @Nullable com.android.wm.shell.pip2.PipTransition newPipTransition) {

        return PipUtils.isPip2ExperimentEnabled() ? newPipTransition : legacyPipTransition;

        if (PipUtils.isPip2ExperimentEnabled() && newPipTransition != null) {

            return newPipTransition;

        } else {

            return legacyPipTransition;

        }

    }

    }

}
 
}