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

Commit 73a93851 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when ActivityClientRecord is null" am: f47829a8 am: a96babb6 

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



Change-Id: I06d7ef6ec37c43f270865aef66d898b342b5727a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa49d5d7 a96babb6

core/java/android/app/servertransaction/TransactionExecutorHelper.java

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.app.ActivityThread.ActivityClientRecord; 
import android.app.ClientTransactionHandler;

import android.os.IBinder;

import android.util.IntArray;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;
@@ -43,6 +44,7 @@ import java.util.List; 
 * @hide

 */

public class TransactionExecutorHelper {

    private static final String TAG = TransactionExecutorHelper.class.getSimpleName();

    // A penalty applied to path with destruction when looking for the shortest one.

    private static final int DESTRUCTION_PENALTY = 10;
@@ -162,6 +164,11 @@ public class TransactionExecutorHelper { 
        if (finalStates == null || finalStates.length == 0) {

            return UNDEFINED;

        }

        if (r == null) {

            // Early return because the ActivityClientRecord hasn't been created or cannot be found.

            Log.w(TAG, "ActivityClientRecord was null");

            return UNDEFINED;

        }



        final int currentState = r.getLifecycleState();

        int closestState = UNDEFINED;