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

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

Merge "Fix issues with launching activities on virtual displays"

parents e6824456 4acfd858

core/java/android/view/DisplayInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ public final class DisplayInfo implements Parcelable { 
    }



    public boolean isHdr() {

        int[] types = hdrCapabilities.getSupportedHdrTypes();

        int[] types = hdrCapabilities != null ? hdrCapabilities.getSupportedHdrTypes() : null;

        return types != null && types.length > 0;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -2072,6 +2072,9 @@ class ActivityStarter { 
            case RECENTS_STACK_ID:

                return r.isRecentsActivity();

            default:

                if (StackId.isDynamicStack(stackId)) {

                    return true;

                }

                Slog.e(TAG, "isValidLaunchStackId: Unexpected stackId=" + stackId);

                return false;

        }