diff options
| author | 2024-12-18 17:38:24 -0800 | |
|---|---|---|
| committer | 2024-12-18 17:38:24 -0800 | |
| commit | 7cfcf309c5b8964db333d74345e461f0134ed1c7 (patch) | |
| tree | d185697f3277abdc0d9671f7f216fc8b1c3a81e9 | |
| parent | 7142fd7704294fe95f1d5146a5b8e668796183c4 (diff) | |
| parent | dd9483570e33d8d6f3735f45c2039e73a04db706 (diff) | |
Merge "ScreenRecordingCallbackController: fix NPE problem." into main am: dd9483570e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3420560
Change-Id: Ib260677858460fa7d8b86e35d2d065d19606bb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java b/services/core/java/com/android/server/wm/ScreenRecordingCallbackController.java index ad4faab1e106..e1b6e5d0e706 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 @@ 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; } } |