diff --git a/shell/platform/android/io/flutter/view/FlutterNativeView.java b/shell/platform/android/io/flutter/view/FlutterNativeView.java index 455ac8c9afb4c7ad154477fcb30df438b5b1ad0a..3a9ab500bc6a8568a2f2dea24eda12f5d11cc988 100644 --- a/shell/platform/android/io/flutter/view/FlutterNativeView.java +++ b/shell/platform/android/io/flutter/view/FlutterNativeView.java @@ -81,30 +81,28 @@ public class FlutterNativeView implements BinaryMessenger { } else if (args.entrypoint == null) { throw new AssertionError("An entrypoint must be specified"); } - runFromBundleInternal(args.bundlePath, args.entrypoint, - args.libraryPath, null); + runFromBundleInternal(args.bundlePath, args.entrypoint, args.libraryPath, args.defaultPath); } /** * @deprecated - * Please use runFromBundle with `FlutterRunArguments`. Parameters - * `snapshotOverride` and `reuseRuntimeController` have no effect. + * Please use runFromBundle with `FlutterRunArguments`. + * Parameter `reuseRuntimeController` has no effect. */ @Deprecated - public void runFromBundle(String bundlePath, String snapshotOverride, String entrypoint, + public void runFromBundle(String bundlePath, String defaultPath, String entrypoint, boolean reuseRuntimeController) { - runFromBundleInternal(bundlePath, entrypoint, null, null); + runFromBundleInternal(bundlePath, entrypoint, null, defaultPath); } private void runFromBundleInternal(String bundlePath, String entrypoint, - String libraryPath, String snapshotOverride) { + String libraryPath, String defaultPath) { assertAttached(); if (applicationIsRunning) throw new AssertionError( "This Flutter engine instance is already running an application"); nativeRunBundleAndSnapshotFromLibrary(mNativePlatformView, bundlePath, - snapshotOverride, entrypoint, libraryPath, - mContext.getResources().getAssets()); + defaultPath, entrypoint, libraryPath, mContext.getResources().getAssets()); applicationIsRunning = true; } @@ -238,7 +236,7 @@ public class FlutterNativeView implements BinaryMessenger { private static native void nativeRunBundleAndSnapshotFromLibrary( long nativePlatformViewAndroid, String bundlePath, - String snapshotOverride, String entrypoint, String libraryUrl, + String defaultPath, String entrypoint, String libraryUrl, AssetManager manager); private static native String nativeGetObservatoryUri(); diff --git a/shell/platform/android/io/flutter/view/FlutterRunArguments.java b/shell/platform/android/io/flutter/view/FlutterRunArguments.java index fb1218f57b168b56c08a08ff7c22027675b243da..f322cb8d24db5fb6e63ee6e05d0f7d3c4f10eec7 100644 --- a/shell/platform/android/io/flutter/view/FlutterRunArguments.java +++ b/shell/platform/android/io/flutter/view/FlutterRunArguments.java @@ -12,5 +12,5 @@ public class FlutterRunArguments { public String bundlePath; public String entrypoint; public String libraryPath; - public String snapshotOverride; + public String defaultPath; } diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 10d4c59f1cf3875d5b7a9e05a72a66feec745756..0acaa6c4e894cb5e75c5fb275c270c660a704e5d 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -611,34 +611,33 @@ public class FlutterView extends SurfaceView /** * @deprecated - * Please use runFromBundle with `FlutterRunArguments`. Parameter - * `snapshotOverride` has no effect. + * Please use runFromBundle with `FlutterRunArguments`. */ @Deprecated - public void runFromBundle(String bundlePath, String snapshotOverride) { - runFromBundle(bundlePath, snapshotOverride, "main", false); + public void runFromBundle(String bundlePath, String defaultPath) { + runFromBundle(bundlePath, defaultPath, "main", false); } /** * @deprecated - * Please use runFromBundle with `FlutterRunArguments`. Parameter - * `snapshotOverride` has no effect. + * Please use runFromBundle with `FlutterRunArguments`. */ @Deprecated - public void runFromBundle(String bundlePath, String snapshotOverride, String entrypoint) { - runFromBundle(bundlePath, snapshotOverride, entrypoint, false); + public void runFromBundle(String bundlePath, String defaultPath, String entrypoint) { + runFromBundle(bundlePath, defaultPath, entrypoint, false); } /** * @deprecated - * Please use runFromBundle with `FlutterRunArguments`. Parameters - * `snapshotOverride` and `reuseRuntimeController` have no effect. + * Please use runFromBundle with `FlutterRunArguments`. + * Parameter `reuseRuntimeController` has no effect. */ @Deprecated - public void runFromBundle(String bundlePath, String snapshotOverride, String entrypoint, boolean reuseRuntimeController) { + public void runFromBundle(String bundlePath, String defaultPath, String entrypoint, boolean reuseRuntimeController) { FlutterRunArguments args = new FlutterRunArguments(); args.bundlePath = bundlePath; args.entrypoint = entrypoint; + args.defaultPath = defaultPath; runFromBundle(args); } diff --git a/shell/platform/android/platform_view_android_jni.cc b/shell/platform/android/platform_view_android_jni.cc index e59321ad0ce6883ec22975959a9a0818f6353cb5..315ac0b55bdc0abe527f8757166986abf310159d 100644 --- a/shell/platform/android/platform_view_android_jni.cc +++ b/shell/platform/android/platform_view_android_jni.cc @@ -241,7 +241,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env, jobject jcaller, jlong shell_holder, jstring jbundlepath, - jstring jsnapshotOverride, + jstring jdefaultPath, jstring jEntrypoint, jstring jLibraryUrl, jobject jAssetManager) { @@ -275,7 +275,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env, } } - const auto defaultpath = fml::jni::JavaStringToString(env, jsnapshotOverride); + const auto defaultpath = fml::jni::JavaStringToString(env, jdefaultPath); if (defaultpath.size() > 0) { asset_manager->PushBack(std::make_unique( fml::OpenFile(defaultpath.c_str(), fml::OpenPermission::kRead, true)));