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

Commit dd948357 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "ScreenRecordingCallbackController: fix NPE problem." into main

parents cec4bfe6 80b1549e

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

+3 −2
Original line number Diff line number Diff line
@@ -95,8 +95,9 @@ public class ScreenRecordingCallbackController { 
        if (mediaProjectionInfo.getLaunchCookie() == null) {

            mRecordedWC = (WindowContainer) mWms.mRoot.getDefaultDisplay();

        } else {

            mRecordedWC = mWms.mRoot.getActivity(activity -> activity.mLaunchCookie

                    == mediaProjectionInfo.getLaunchCookie().binder).getTask();

            final ActivityRecord matchingActivity = mWms.mRoot.getActivity(activity ->

                    activity.mLaunchCookie == mediaProjectionInfo.getLaunchCookie().binder);

            mRecordedWC = matchingActivity != null ? matchingActivity.getTask() : null;

        }

    }