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

Merge "Skip transfer splash screen if activity is destroying or destroyed" into tm-dev am: cdb9f0c8aa

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

Change-Id: I22d64b4b13743f1dc8344f0582a2bb2713a8ceba
This commit is contained in:
TreeHugger Robot
2022-03-07 08:50:25 +00:00
committed by Automerger Merge Worker
parent 95efce419d cdb9f0c8aa
commit c48ea40246
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/servertransaction/ActivityTransactionItem.java
View File

@@ -64,11 +64,11 @@ public abstract class ActivityTransactionItem extends ClientTransactionItem {
final ActivityClientRecord r = client.getActivityClient(token); final ActivityClientRecord r = client.getActivityClient(token);
if (r == null) { if (r == null) {
throw new IllegalArgumentException("Activity client record must not be null to execute " throw new IllegalArgumentException("Activity client record must not be null to execute "
+ "transaction item"); + "transaction item: " + this);
} }
if (client.getActivity(token) == null) { if (client.getActivity(token) == null) {
throw new IllegalArgumentException("Activity must not be null to execute " throw new IllegalArgumentException("Activity must not be null to execute "
+ "transaction item"); + "transaction item: " + this);
} }
return r; return r;
} }

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -2452,7 +2452,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// either way, abort and reset the sequence. // either way, abort and reset the sequence.
if (parcelable == null if (parcelable == null
|| mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING
|| mStartingWindow == null) { || mStartingWindow == null
|| finishing) {
if (parcelable != null) { if (parcelable != null) {
parcelable.clearIfNeeded(); parcelable.clearIfNeeded();
} }