summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-13 19:38:31 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-13 19:38:31 -0700
commit64184ab4cd39f8ffd16aa8f6747b39d5b6a88f9d (patch)
treea5ac982ac2e0d11b13da82baddf5fc12f59c6a8c
parent1a88c349578a8cbc4f6b63b5413ae41617b39f84 (diff)
parent2faac87d96b4e4e9127671171f9274d9ab1ea110 (diff)
Merge "Remove redundant Nullable annotation for applyDisplayChangeIfNeeded method." into main am: 1849a4c116 am: 2faac87d96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3542019 Change-Id: I3f7ca95a2ee1ae9ff640846a6241a14d84e32ab9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/wm/Transition.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 2c10af4c5851..65001f436d3f 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -3401,7 +3401,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
* Applies the new configuration for the changed displays. Returns the activities that should
* check whether to deliver the new configuration to clients.
*/
- @Nullable
void applyDisplayChangeIfNeeded(@NonNull ArraySet<WindowContainer<?>> activitiesMayChange) {
for (int i = mParticipants.size() - 1; i >= 0; --i) {
final WindowContainer<?> wc = mParticipants.valueAt(i);