[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I215f0827a6daf409f3a728277052876a82d8bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ic950b7f3514c9ca8e04bf77f7f684c98efa08145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I1b300bc975178df62bdb1d747bd37d08ffd7cfbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I5092d539b092d113487d2738d68c80068f04a4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I32ad328e67c46d9605e191675ca479f8ebb99271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ia869037c96a72937200e207907a072ada596c35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I8c9b34afafb28597afd38c887e965d395035c134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Id08ae2f3f841511af4960004bb3aacf5ceffc824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ic5d881ca4e0c68edc53fcec53ab327ae45ff01b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I014bdcff1d3dd3902c4155ce26b575a70846bcba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ic6933da88e36b463ac5c71f5297f8eb824f891c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: I5a59e5f4bc95ecb45dbe11f0ebabdefda32f755a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



Change-Id: Ie675bd43fc1c7022faa64fa0d66587e279ec0960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4

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



Change-Id: I2211e60a745e9870688b94dba86fb31e7c6b21ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

- Follow up to ag/24812535, there were a few cases where we don't call
  into prepareEnterSplit() but still need to reset the reparenting
  state to prevent trampolines from breaking splitscreen upon entering.

Fixes: 292454704
Test: Launch split from the menu for app that launches a trampoline
Change-Id: Ia0d825192c3ec78991a75f0501e7ece9d75cb4af

Auto-generated-cl: translation import
Change-Id: I4b97ea319a60284e4636cfc31956f8d2766a4518

Auto-generated-cl: translation import
Change-Id: Idbd05f27d8bb126e2304b20c18c9bdee15a6e5ed

Auto-generated-cl: translation import
Change-Id: Iaf57b981f119dcb7c89229c3fe793b86f1d257c1

Auto-generated-cl: translation import
Change-Id: Ie1d800ccb16f7f37c2f17d86412d192f2d7b829f

Auto-generated-cl: translation import
Change-Id: I842547e32bc9d43536b5f3921e11f1ca96191132

Auto-generated-cl: translation import
Change-Id: I5dd7650cdd170f541dcdf5ba640d509269246f54

Bug: 302346449
Test: m -j
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f47e45d322043c4e2e11bb2fbd09c980ffe232b8)
Merged-In: Ibbf789889aed57c18f6f7d21736c838a3d069d5b
Change-Id: Ibbf789889aed57c18f6f7d21736c838a3d069d5b

This fixes an issue where the default target duration was being sent
when re-creating sessions, after the true target duration was already
known. This caused the wrong value in PowerHAL, and no corrective update
was sent because the cached value never changed.

Bug: 301806277
Test: hwuitest
Change-Id: I80d90e855fce92264d8341aad78b19dc547b65f4
Merged-In: I80d90e855fce92264d8341aad78b19dc547b65f4

This CL fixes the issue where, when an app have multiple main
activities, the total number of shortcuts can grow indefinitely if they
were published through addDynamicShortcuts.

Bug: 281061287
Test: manual
Change-Id: Ib3eecefee34517b670c59dd5b8526fe9eb24f463
Merged-In: Ib3eecefee34517b670c59dd5b8526fe9eb24f463