Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 509a43f

Browse files
authored
Apply minor cleanups to Android embedding (#9088)
Eliminate an unused import, add missing @OverRide annotations, and eliminate an unused logger.
1 parent 0a0f330 commit 509a43f

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void destroy() {
9797
removeAll();
9898
}
9999

100+
@Override
100101
public void add(@NonNull FlutterPlugin plugin) {
101102
// Add the plugin to our generic set of plugins and notify the plugin
102103
// that is has been attached to an engine.
@@ -152,20 +153,24 @@ public void add(@NonNull FlutterPlugin plugin) {
152153
}
153154
}
154155

156+
@Override
155157
public void add(@NonNull Set<FlutterPlugin> plugins) {
156158
for (FlutterPlugin plugin : plugins) {
157159
add(plugin);
158160
}
159161
}
160162

163+
@Override
161164
public boolean has(@NonNull Class<? extends FlutterPlugin> pluginClass) {
162165
return plugins.containsKey(pluginClass);
163166
}
164167

168+
@Override
165169
public FlutterPlugin get(@NonNull Class<? extends FlutterPlugin> pluginClass) {
166170
return plugins.get(pluginClass);
167171
}
168172

173+
@Override
169174
public void remove(@NonNull Class<? extends FlutterPlugin> pluginClass) {
170175
FlutterPlugin plugin = plugins.get(pluginClass);
171176
if (plugin != null) {
@@ -220,12 +225,14 @@ public void remove(@NonNull Class<? extends FlutterPlugin> pluginClass) {
220225
}
221226
}
222227

228+
@Override
223229
public void remove(@NonNull Set<Class<? extends FlutterPlugin>> pluginClasses) {
224230
for (Class<? extends FlutterPlugin> pluginClass : pluginClasses) {
225231
remove(pluginClass);
226232
}
227233
}
228234

235+
@Override
229236
public void removeAll() {
230237
// We copy the keys to a new set so that we can mutate the set while using
231238
// the keys.
@@ -489,6 +496,7 @@ public FlutterEngineActivityPluginBinding(@NonNull Activity activity) {
489496
* Returns the {@link Activity} that is currently attached to the {@link FlutterEngine} that
490497
* owns this {@code ActivityPluginBinding}.
491498
*/
499+
@Override
492500
@NonNull
493501
public Activity getActivity() {
494502
return activity;
@@ -498,13 +506,15 @@ public Activity getActivity() {
498506
* Adds a listener that is invoked whenever the associated {@link Activity}'s
499507
* {@code onRequestPermissionsResult(...)} method is invoked.
500508
*/
509+
@Override
501510
public void addRequestPermissionsResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener listener) {
502511
onRequestPermissionsResultListeners.add(listener);
503512
}
504513

505514
/**
506515
* Removes a listener that was added in {@link #addRequestPermissionsResultListener(io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener)}.
507516
*/
517+
@Override
508518
public void removeRequestPermissionsResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener listener) {
509519
onRequestPermissionsResultListeners.remove(listener);
510520
}
@@ -525,13 +535,15 @@ boolean onRequestPermissionsResult(int requestCode, @NonNull String[] permission
525535
* Adds a listener that is invoked whenever the associated {@link Activity}'s
526536
* {@code onActivityResult(...)} method is invoked.
527537
*/
538+
@Override
528539
public void addActivityResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.ActivityResultListener listener) {
529540
onActivityResultListeners.add(listener);
530541
}
531542

532543
/**
533544
* Removes a listener that was added in {@link #addActivityResultListener(io.flutter.plugin.common.PluginRegistry.ActivityResultListener)}.
534545
*/
546+
@Override
535547
public void removeActivityResultListener(@NonNull io.flutter.plugin.common.PluginRegistry.ActivityResultListener listener) {
536548
onActivityResultListeners.remove(listener);
537549
}
@@ -552,13 +564,15 @@ boolean onActivityResult(int requestCode, int resultCode, @NonNull Intent data)
552564
* Adds a listener that is invoked whenever the associated {@link Activity}'s
553565
* {@code onNewIntent(...)} method is invoked.
554566
*/
567+
@Override
555568
public void addOnNewIntentListener(@NonNull io.flutter.plugin.common.PluginRegistry.NewIntentListener listener) {
556569
onNewIntentListeners.add(listener);
557570
}
558571

559572
/**
560573
* Removes a listener that was added in {@link #addOnNewIntentListener(io.flutter.plugin.common.PluginRegistry.NewIntentListener)}.
561574
*/
575+
@Override
562576
public void removeOnNewIntentListener(@NonNull io.flutter.plugin.common.PluginRegistry.NewIntentListener listener) {
563577
onNewIntentListeners.remove(listener);
564578
}
@@ -577,13 +591,15 @@ void onNewIntent(@Nullable Intent intent) {
577591
* Adds a listener that is invoked whenever the associated {@link Activity}'s
578592
* {@code onUserLeaveHint()} method is invoked.
579593
*/
594+
@Override
580595
public void addOnUserLeaveHintListener(@NonNull io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener listener) {
581596
onUserLeaveHintListeners.add(listener);
582597
}
583598

584599
/**
585600
* Removes a listener that was added in {@link #addOnUserLeaveHintListener(io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener)}.
586601
*/
602+
@Override
587603
public void removeOnUserLeaveHintListener(@NonNull io.flutter.plugin.common.PluginRegistry.UserLeaveHintListener listener) {
588604
onUserLeaveHintListeners.remove(listener);
589605
}

shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ class InputConnectionAdaptor extends BaseInputConnection {
2929
private InputMethodManager mImm;
3030
private final Layout mLayout;
3131

32-
private static final MethodChannel.Result logger =
33-
new ErrorLogResult("FlutterTextInput");
34-
3532
@SuppressWarnings("deprecation")
3633
public InputConnectionAdaptor(
3734
View view,

shell/platform/android/io/flutter/view/FlutterMain.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package io.flutter.view;
66

7-
import android.app.AlarmManager;
87
import android.app.PendingIntent;
98
import android.content.Context;
109
import android.content.Intent;

0 commit comments

Comments
 (0)