Skip to content

[webview_flutter_android] [camera_android_camerax] Updates internal Java InstanceManager to only stop finalization callbacks when stopped #3571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 11 commits into from
Apr 14, 2023
Merged

[webview_flutter_android] [camera_android_camerax] Updates internal Java InstanceManager to only stop finalization callbacks when stopped #3571

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1fe8a4e
update webview_flutter instance mangaer
bparrishMines Mar 28, 2023
412036c
camerax side of change
bparrishMines Mar 28, 2023
ee44f2f
version bump
bparrishMines Mar 28, 2023
f73f110
version bump camerax
bparrishMines Mar 28, 2023
c5fe12e
stopped
bparrishMines Mar 28, 2023
10899d0
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Mar 28, 2023
c42d4da
add test
bparrishMines Mar 28, 2023
cb0c128
remove tests
bparrishMines Mar 28, 2023
7379b40
Merge branch 'main' of github.com:flutter/packages into instance_mana…
bparrishMines Apr 13, 2023
2ec0a60
add integration test
bparrishMines Apr 14, 2023
c559338
make constant private again
bparrishMines Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
make constant private again
  • Loading branch information
@bparrishMines
bparrishMines committed Apr 14, 2023
commit c55933870b8a499cfb522fe1b2f845f85b64d537
3 changes: 1 addition & 2 deletions ...era_android_camerax/android/src/main/java/io/flutter/plugins/camerax/InstanceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.HashMap;
Expand Down Expand Up @@ -37,7 +36,7 @@ public class InstanceManager {
// Host uses identifiers >= 2^16 and Dart is expected to use values n where,
// 0 <= n < 2^16.
private static final long MIN_HOST_CREATED_IDENTIFIER = 65536;
@VisibleForTesting public static final long CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL = 30000;
private static final long CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL = 30000;
private static final String TAG = "InstanceManager";

/** Interface for listening when a weak reference of an instance is removed from the manager. */
Expand Down
5 changes: 3 additions & 2 deletions ...droid/app/src/androidTest/java/io/flutter/plugins/cameraxexample/InstanceManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package io.flutter.plugins.cameraexample;

import static io.flutter.plugins.camerax.InstanceManager.CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -34,7 +33,9 @@ public void managerDoesNotTriggerFinalizationListenerWhenStopped() throws Interr

Runtime.getRuntime().gc();

Thread.sleep(CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL);
// Wait for the interval after finalized callbacks are made for garbage collected objects.
// See InstanceManager.CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL.
Thread.sleep(30000);

assertNull(instanceManager.getInstance(0));
assertFalse(callbackTriggered[0]);
Expand Down
3 changes: 1 addition & 2 deletions ...tter_android/android/src/main/java/io/flutter/plugins/webviewflutter/InstanceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.HashMap;
Expand Down Expand Up @@ -37,7 +36,7 @@ public class InstanceManager {
// Host uses identifiers >= 2^16 and Dart is expected to use values n where,
// 0 <= n < 2^16.
private static final long MIN_HOST_CREATED_IDENTIFIER = 65536;
@VisibleForTesting public static final long CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL = 3000;
private static final long CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL = 3000;
private static final String TAG = "InstanceManager";

/** Interface for listening when a weak reference of an instance is removed from the manager. */
Expand Down
5 changes: 3 additions & 2 deletions ...pp/src/androidTest/java/io/flutter/plugins/webviewflutterexample/InstanceManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package io.flutter.plugins.webviewflutterexample;

import static io.flutter.plugins.webviewflutter.InstanceManager.CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -34,7 +33,9 @@ public void managerDoesNotTriggerFinalizationListenerWhenStopped() throws Interr

Runtime.getRuntime().gc();

Thread.sleep(CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL);
// Wait for the interval after finalized callbacks are made for garbage collected objects.
// See InstanceManager.CLEAR_FINALIZED_WEAK_REFERENCES_INTERVAL.
Thread.sleep(30000);

assertNull(instanceManager.getInstance(0));
assertFalse(callbackTriggered[0]);
Expand Down