Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb9f0c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7d2434fb ec821bed

core/java/android/app/servertransaction/ActivityTransactionItem.java

+2 −2
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ public abstract class ActivityTransactionItem extends ClientTransactionItem { 
        final ActivityClientRecord r = client.getActivityClient(token);

        if (r == null) {

            throw new IllegalArgumentException("Activity client record must not be null to execute "

                    + "transaction item");

                    + "transaction item: " + this);

        }

        if (client.getActivity(token) == null) {

            throw new IllegalArgumentException("Activity must not be null to execute "

                    + "transaction item");

                    + "transaction item: " + this);

        }

        return r;

    }

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −1
Original line number Diff line number Diff line
@@ -2452,7 +2452,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // either way, abort and reset the sequence.

        if (parcelable == null

                || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING

                || mStartingWindow == null) {

                || mStartingWindow == null

                || finishing) {

            if (parcelable != null) {

                parcelable.clearIfNeeded();

            }