Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jernej Virag
2023-08-03 11:08:41 +00:00
committed by Android (Google) Code Review
parent ca88ae4d1b c461922005
commit f62a0e11d6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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;
}
} }
} }