commit dd9483570e33d8d6f3735f45c2039e73a04db706
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Dec 18 17:36:01 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 18 17:36:01 2024 -0800
tree d185697f3277abdc0d9671f7f216fc8b1c3a81e9
parent cec4bfe6d79199c0d2f38ee32d265af9d6400dbf
parent 80b1549e9a105b153168dcd19fc704d143939ea2

Merge "ScreenRecordingCallbackController: fix NPE problem." into main

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

diff --git a/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java b/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java
index ad4faab..e1b6e5d 100644
--- a/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java
+++ b/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java
@@ -95,8 +95,9 @@
         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;
         }
     }