DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when splash screen is not specified for FlutterFragmentActivity (flutter/engine#27062)

Browse Source
This commit is contained in:
Jia Hao 2021-07-29 11:09:01 +08:00 committed by GitHub
parent bd6e47b7d0
commit 573de315ec
3 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterFragmentActivity.java
View File

@ -326,9 +326,8 @@ public class FlutterFragmentActivity extends FragmentActivity
private Drawable getSplashScreenFromManifest() {
try {
Bundle metaData = getMetaData();
Integer splashScreenId =
metaData != null ? metaData.getInt(SPLASH_SCREEN_META_DATA_KEY) : null;
return splashScreenId != null
int splashScreenId = metaData != null ? metaData.getInt(SPLASH_SCREEN_META_DATA_KEY) : 0;
return splashScreenId != 0
? ResourcesCompat.getDrawable(getResources(), splashScreenId, getTheme())
: null;
} catch (Resources.NotFoundException e) {

20
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
View File

@ -416,6 +416,26 @@ public class FlutterActivityTest {
assertNotNull(splashScreen);
}
@Test
public void itWithMetadataWithoutSplashScreenResourceKeyDoesNotProvideSplashScreen()
throws PackageManager.NameNotFoundException {
Intent intent = FlutterActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterActivity> activityController =
Robolectric.buildActivity(FlutterActivity.class, intent);
FlutterActivity flutterActivity = activityController.get();
// Setup an empty metadata file.
PackageManager pm = RuntimeEnvironment.application.getPackageManager();
ActivityInfo activityInfo =
pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
activityInfo.metaData = new Bundle();
shadowOf(RuntimeEnvironment.application.getPackageManager()).addOrUpdateActivity(activityInfo);
// It should not load the drawable.
SplashScreen splashScreen = flutterActivity.provideSplashScreen();
assertNull(splashScreen);
}
static class FlutterActivityWithProvidedEngine extends FlutterActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {

44
engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java
View File

@ -243,15 +243,15 @@ public class FlutterFragmentActivityTest {
@Config(shadows = {SplashShadowResources.class})
public void itLoadsSplashScreenDrawable() throws PackageManager.NameNotFoundException {
TestUtils.setApiVersion(19);
Intent intent = FlutterActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterActivity> activityController =
Robolectric.buildActivity(FlutterActivity.class, intent);
FlutterActivity flutterActivity = activityController.get();
Intent intent = FlutterFragmentActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterFragmentActivity> activityController =
Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
FlutterFragmentActivity activity = activityController.get();
// Inject splash screen drawable resource id in the metadata
PackageManager pm = RuntimeEnvironment.application.getPackageManager();
ActivityInfo activityInfo =
pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
activityInfo.metaData = new Bundle();
activityInfo.metaData.putInt(
FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
@ -259,7 +259,7 @@ public class FlutterFragmentActivityTest {
shadowOf(RuntimeEnvironment.application.getPackageManager()).addOrUpdateActivity(activityInfo);
// It should load the drawable.
SplashScreen splashScreen = flutterActivity.provideSplashScreen();
SplashScreen splashScreen = activity.provideSplashScreen();
assertNotNull(splashScreen);
}
@ -271,15 +271,15 @@ public class FlutterFragmentActivityTest {
// in getDrawable methods. This test verifies it by fetching a (fake) themed drawable.
// On failure, a Resource.NotFoundException will ocurr.
TestUtils.setApiVersion(21);
Intent intent = FlutterActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterActivity> activityController =
Robolectric.buildActivity(FlutterActivity.class, intent);
FlutterActivity flutterActivity = activityController.get();
Intent intent = FlutterFragmentActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterFragmentActivity> activityController =
Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
FlutterFragmentActivity activity = activityController.get();
// Inject themed splash screen drawable resource id in the metadata.
PackageManager pm = RuntimeEnvironment.application.getPackageManager();
ActivityInfo activityInfo =
pm.getActivityInfo(flutterActivity.getComponentName(), PackageManager.GET_META_DATA);
pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
activityInfo.metaData = new Bundle();
activityInfo.metaData.putInt(
FlutterActivityLaunchConfigs.SPLASH_SCREEN_META_DATA_KEY,
@ -287,10 +287,30 @@ public class FlutterFragmentActivityTest {
shadowOf(RuntimeEnvironment.application.getPackageManager()).addOrUpdateActivity(activityInfo);
// It should load the drawable.
SplashScreen splashScreen = flutterActivity.provideSplashScreen();
SplashScreen splashScreen = activity.provideSplashScreen();
assertNotNull(splashScreen);
}
@Test
public void itWithMetadataWithoutSplashScreenResourceKeyDoesNotProvideSplashScreen()
throws PackageManager.NameNotFoundException {
Intent intent = FlutterFragmentActivity.createDefaultIntent(RuntimeEnvironment.application);
ActivityController<FlutterFragmentActivity> activityController =
Robolectric.buildActivity(FlutterFragmentActivity.class, intent);
FlutterFragmentActivity activity = activityController.get();
// Setup an empty metadata file.
PackageManager pm = RuntimeEnvironment.application.getPackageManager();
ActivityInfo activityInfo =
pm.getActivityInfo(activity.getComponentName(), PackageManager.GET_META_DATA);
activityInfo.metaData = new Bundle();
shadowOf(RuntimeEnvironment.application.getPackageManager()).addOrUpdateActivity(activityInfo);
// It should not load the drawable.
SplashScreen splashScreen = activity.provideSplashScreen();
assertNull(splashScreen);
}
static class FlutterFragmentActivityWithProvidedEngine extends FlutterFragmentActivity {
int numberOfEnginesCreated = 0;