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

Commit b7243ae4 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "[ActivityManager] Fix NullPointerException in... 

Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed8 am: d89b76a5
am: 8401a8d0

* commit '8401a8d0':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
parents 99b95fdc 8401a8d0

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -4092,8 +4092,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
                        if (debug) {

                            Slog.v(TAG, "Next matching activity: found current " + r.packageName

                                    + "/" + r.info.name);

                            Slog.v(TAG, "Next matching activity: next is " + aInfo.packageName

                                    + "/" + aInfo.name);

                            Slog.v(TAG, "Next matching activity: next is " + ((aInfo == null)

                                    ? "null" : aInfo.packageName + "/" + aInfo.name));

                        }

                        break;

                    }