Fix NPE when platform plugin delegate is null (flutter/engine#49391)

Fixes: 
https://github.com/flutter/flutter/issues/140600
https://github.com/flutter/flutter/issues/140031

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[test-exempt]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
This commit is contained in:
Rulong Chen(陈汝龙)
2024-01-03 00:54:39 +08:00
committed by GitHub
parent 62abbc2a03
commit ba2b335b99
2 changed files with 20 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ public class PlatformPlugin {
private final Activity activity;
private final PlatformChannel platformChannel;
private final PlatformPluginDelegate platformPluginDelegate;
@Nullable private final PlatformPluginDelegate platformPluginDelegate;
private PlatformChannel.SystemChromeStyle currentTheme;
private int mEnabledOverlays;
private static final String TAG = "PlatformPlugin";
@@ -161,7 +161,7 @@ public class PlatformPlugin {
public PlatformPlugin(
@NonNull Activity activity,
@NonNull PlatformChannel platformChannel,
@NonNull PlatformPluginDelegate delegate) {
@Nullable PlatformPluginDelegate delegate) {
this.activity = activity;
this.platformChannel = platformChannel;
this.platformChannel.setPlatformMessageHandler(mPlatformMessageHandler);
@@ -499,7 +499,9 @@ public class PlatformPlugin {
}
private void setFrameworkHandlesBack(boolean frameworkHandlesBack) {
platformPluginDelegate.setFrameworkHandlesBack(frameworkHandlesBack);
if (platformPluginDelegate != null) {
platformPluginDelegate.setFrameworkHandlesBack(frameworkHandlesBack);
}
}
private void popSystemNavigator() {

View File

@@ -11,6 +11,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.doThrow;
@@ -613,6 +614,20 @@ public class PlatformPluginTest {
verify(mockPlatformPluginDelegate, times(1)).setFrameworkHandlesBack(true);
}
@Test
public void testPlatformPluginDelegateNull() throws Exception {
Activity mockActivity = mock(Activity.class);
PlatformPlugin platformPlugin =
new PlatformPlugin(mockActivity, mockPlatformChannel, null /*platformPluginDelegate*/);
try {
platformPlugin.mPlatformMessageHandler.setFrameworkHandlesBack(true);
} catch (NullPointerException e) {
// Not expected
fail("NullPointerException was thrown");
}
}
@Test
public void popSystemNavigatorFlutterActivity() {
Activity mockActivity = mock(Activity.class);