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

Commit 51084b4b authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Fix @Nullability mismatch with PipTransition" into udc-qpr-dev am: f62a0e11 am: 3479c8b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24263643



Change-Id: I3fbf13818a21ce8dff4ae5ff56d4e14770e88431
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 228bfe17 3479c8b8

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

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


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



import android.annotation.Nullable;

import android.content.Context;

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


    @WMSingleton

    @Provides

    @Nullable

    static PipTransition providePipTransition(Context context,

            ShellInit shellInit, ShellTaskOrganizer shellTaskOrganizer, Transitions transitions,

            PipAnimationController pipAnimationController, PipBoundsAlgorithm pipBoundsAlgorithm,

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

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

    @WMSingleton

    @Provides

    @Nullable

    static PipTransitionController providePipTransitionController(

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

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

        return PipUtils.isPip2ExperimentEnabled() ? newPipTransition : legacyPipTransition;

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

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

            return newPipTransition;

        } else {

            return legacyPipTransition;

        }

    }

}