diff options
3 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl index df6badcffe8e..d54074818b41 100644 --- a/core/java/android/app/IActivityTaskManager.aidl +++ b/core/java/android/app/IActivityTaskManager.aidl @@ -328,7 +328,7 @@ interface IActivityTaskManager { * A splash screen view has copied. */ void onSplashScreenViewCopyFinished(int taskId, - in SplashScreenView.SplashScreenViewParcelable material); + in @nullable SplashScreenView.SplashScreenViewParcelable material); /** * When the Picture-in-picture state has changed. diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 24d99387d63c..95af8830f827 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2725,7 +2725,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * Receive the splash screen data from shell, sending to client. * @param parcelable The data to reconstruct the splash screen view, null mean unable to copy. */ - void onCopySplashScreenFinish(SplashScreenViewParcelable parcelable) { + void onCopySplashScreenFinish(@Nullable SplashScreenViewParcelable parcelable) { removeTransferSplashScreenTimeout(); final SurfaceControl windowAnimationLeash = (parcelable == null || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 3c56a4e5eb04..343f3721503b 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3608,8 +3608,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { * @hide */ @Override - public void onSplashScreenViewCopyFinished(int taskId, SplashScreenViewParcelable parcelable) - throws RemoteException { + public void onSplashScreenViewCopyFinished(int taskId, + @Nullable SplashScreenViewParcelable parcelable) + throws RemoteException { mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_TASKS, "copySplashScreenViewFinish()"); synchronized (mGlobalLock) { |