From cf026b098d15fb70a20b454dfcf28fdf0fc7c5f9 Mon Sep 17 00:00:00 2001 From: Yegor Date: Fri, 27 Apr 2018 13:47:26 -0700 Subject: [PATCH] Revert "Hold a global reference to the AssetManager Java object backing the APKAssetProvider (#5078)" (#5116) This reverts commit ac682632d7b050463e0461cbb416aaedbcba4bcf. It causes engine crashes in some Android Espresso tests. --- shell/platform/android/apk_asset_provider.cc | 3 +-- shell/platform/android/apk_asset_provider.h | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/shell/platform/android/apk_asset_provider.cc b/shell/platform/android/apk_asset_provider.cc index 268897ef5c5..4cf6da16dc6 100644 --- a/shell/platform/android/apk_asset_provider.cc +++ b/shell/platform/android/apk_asset_provider.cc @@ -10,8 +10,7 @@ namespace blink { APKAssetProvider::APKAssetProvider(JNIEnv* env, jobject jassetManager, std::string directory) - : java_asset_manager_(env, jassetManager), - directory_(std::move(directory)) { + : directory_(std::move(directory)) { assetManager_ = AAssetManager_fromJava(env, jassetManager); } diff --git a/shell/platform/android/apk_asset_provider.h b/shell/platform/android/apk_asset_provider.h index 7c3f8e12a23..70ddbe454bc 100644 --- a/shell/platform/android/apk_asset_provider.h +++ b/shell/platform/android/apk_asset_provider.h @@ -9,7 +9,6 @@ #include #include "flutter/assets/asset_resolver.h" -#include "flutter/fml/platform/android/scoped_java_ref.h" #include "lib/fxl/memory/ref_counted.h" namespace blink { @@ -22,7 +21,6 @@ class APKAssetProvider final : public AssetResolver { virtual ~APKAssetProvider(); private: - fml::jni::ScopedJavaGlobalRef java_asset_manager_; AAssetManager* assetManager_; const std::string directory_; @@ -38,4 +36,4 @@ class APKAssetProvider final : public AssetResolver { } // namespace blink -#endif // FLUTTER_ASSETS_APK_ASSET_PROVIDER_H +#endif // FLUTTER_ASSETS_APK_ASSET_PROVIDER_H \ No newline at end of file