Add right annotation to IActivityTaskManager#onSplashScreenViewCopyFinished
Bug: 288398263
Test: m update-api; m wear-sdk; m WearServices; atest WmTests
Defer-CP-To-Master: 288398263
Change-Id: I0449eb983348707cab18995b176428f57793caa3
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index df6badc..d540748 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -328,7 +328,7 @@
* 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 24d9938..95af883 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 @@
* 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 3c56a4e..343f372 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 @@
* @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) {