diff options
| author | 2024-07-14 16:06:11 -0700 | |
|---|---|---|
| committer | 2024-07-14 16:06:11 -0700 | |
| commit | 14ff66df0cf0f4bf80d648d05ebdf0dc16dd4d83 (patch) | |
| tree | 78ddd7acf71fce67c650ae3a748845c4ddd5f05c | |
| parent | c7c024121b368b4815c67b05c080a80f92a75a44 (diff) | |
Fix NullPointerException for baseActivity
* We are using base intent because baseActivity which can be null in
rare cases, add null check to avoid the crash.
* This is manually CP'd from http://pa/2771550
Bug: 331118994
Test: run auto Test
Change-Id: I8a1bc98f1b53292266184f9f1e78def28c0e795f
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index d9e97766e4fe..b2557f273ed1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -3719,8 +3719,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, mSplitTransitions.startDismissTransition(wct, StageCoordinator.this, stageType, EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW); Log.w(TAG, splitFailureMessage("onNoLongerSupportMultiWindow", - "app package " + taskInfo.baseActivity.getPackageName() - + " does not support splitscreen, or is a controlled activity type")); + "app package " + taskInfo.baseIntent.getComponent() + + " does not support splitscreen, or is a controlled activity" + + " type")); if (splitScreenVisible) { handleUnsupportedSplitStart(); } |