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

Commit 80b1549e authored by lijilou's avatar lijilou Committed by Jilou li
Browse files

ScreenRecordingCallbackController: fix NPE problem. 

the getActivity mehod of WindowContainer may be return null if no match activity find.

Test: OEM monkey test
Flag: EXEMPT bugfix
Bug: 384839854
Change-Id: I1916ccbd9783a4f8c65450797a587c8af57ec070
parent 7b641717

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;

        }

    }