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

Commit 36b8c779 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Fix NPE when calling recreate in onCreate am: 6c675a3a 

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

Change-Id: Ie56c2b12698b48a64d104653e36d498fa9f966ff
parents d3b8eb31 6c675a3a

core/java/android/app/ActivityThread.java

+2 −2
Original line number Diff line number Diff line
@@ -5654,8 +5654,8 @@ public final class ActivityThread extends ClientTransactionHandler 
     */

    private void scheduleRelaunchActivityIfPossible(@NonNull ActivityClientRecord r,

            boolean preserveWindow) {

        if (r.activity.mFinished || r.token instanceof Binder) {

            // Do not schedule relaunch if the activity is finishing or not a local object (e.g.

        if ((r.activity != null && r.activity.mFinished) || r.token instanceof Binder) {

            // Do not schedule relaunch if the activity is finishing or is a local object (e.g.

            // created by ActivtiyGroup that server side doesn't recognize it).

            return;

        }