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

Commit 43da89b

Browse files
GaryQianGaryQian
committed
Fix android lint issues
1 parent c315b22 commit 43da89b

23 files changed

+119
-221
lines changed

‎shell/platform/android/io/flutter/embedding/android/FlutterView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ public View findViewByAccessibilityIdTraversal(int accessibilityId) {
10281028
* @param currentView The root view.
10291029
* @return A descendant of currentView or currentView itself.
10301030
*/
1031-
@SuppressLint("PrivateApi")
1031+
@SuppressLint("DiscouragedPrivateApi")
10321032
private View findViewByAccessibilityIdRootedAtCurrentView(int accessibilityId, View currentView) {
10331033
Method getAccessibilityViewIdMethod;
10341034
try {

‎shell/platform/android/io/flutter/embedding/engine/FlutterEngineConnectionRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
flutterEngine,
106106
flutterEngine.getDartExecutor(),
107107
flutterEngine.getRenderer(),
108-
flutterEngine.getPlatformViewsController().getRegistry(),
109-
new DefaultFlutterAssets(flutterLoader));
108+
new DefaultFlutterAssets(flutterLoader),
109+
flutterEngine.getPlatformViewsController().getRegistry());
110110
}
111111

112112
public void destroy() {

‎shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ public void setMessageHandler(
238238
@UiThread
239239
public void setMessageHandler(
240240
@NonNull String channel,
241-
@Nullable BinaryMessenger.BinaryMessageHandler handler,
242-
@Nullable TaskQueue taskQueue) {
243-
binaryMessenger.setMessageHandler(channel, handler, taskQueue);
241+
@Nullable TaskQueue taskQueue,
242+
@Nullable BinaryMessenger.BinaryMessageHandler handler) {
243+
binaryMessenger.setMessageHandler(channel, taskQueue, handler);
244244
}
245245

246246
/** @deprecated Use {@link #getBinaryMessenger()} instead. */
@@ -489,9 +489,9 @@ public void setMessageHandler(
489489
@UiThread
490490
public void setMessageHandler(
491491
@NonNull String channel,
492-
@Nullable BinaryMessenger.BinaryMessageHandler handler,
493-
@Nullable TaskQueue taskQueue) {
494-
messenger.setMessageHandler(channel, handler, taskQueue);
492+
@Nullable TaskQueue taskQueue,
493+
@Nullable BinaryMessenger.BinaryMessageHandler handler) {
494+
messenger.setMessageHandler(channel, taskQueue, handler);
495495
}
496496

497497
@Override

‎shell/platform/android/io/flutter/embedding/engine/dart/DartMessenger.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@ public TaskQueue makeBackgroundTaskQueue(TaskQueueOptions options) {
197197
@Override
198198
public void setMessageHandler(
199199
@NonNull String channel, @Nullable BinaryMessenger.BinaryMessageHandler handler) {
200-
setMessageHandler(channel, handler, null);
200+
setMessageHandler(channel, null, handler);
201201
}
202202

203203
@Override
204204
public void setMessageHandler(
205205
@NonNull String channel,
206-
@Nullable BinaryMessenger.BinaryMessageHandler handler,
207-
@Nullable TaskQueue taskQueue) {
206+
@Nullable TaskQueue taskQueue,
207+
@Nullable BinaryMessenger.BinaryMessageHandler handler) {
208208
if (handler == null) {
209209
Log.v(TAG, "Removing handler for channel '" + channel + "'");
210210
synchronized (handlersLock) {

‎shell/platform/android/io/flutter/embedding/engine/plugins/FlutterPlugin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,22 +105,22 @@ class FlutterPluginBinding {
105105
private final FlutterEngine flutterEngine;
106106
private final BinaryMessenger binaryMessenger;
107107
private final TextureRegistry textureRegistry;
108-
private final PlatformViewRegistry platformViewRegistry;
109108
private final FlutterAssets flutterAssets;
109+
private final PlatformViewRegistry platformViewRegistry;
110110

111111
public FlutterPluginBinding(
112112
@NonNull Context applicationContext,
113113
@NonNull FlutterEngine flutterEngine,
114114
@NonNull BinaryMessenger binaryMessenger,
115115
@NonNull TextureRegistry textureRegistry,
116-
@NonNull PlatformViewRegistry platformViewRegistry,
117-
@NonNull FlutterAssets flutterAssets) {
116+
@NonNull FlutterAssets flutterAssets,
117+
@NonNull PlatformViewRegistry platformViewRegistry) {
118118
this.applicationContext = applicationContext;
119119
this.flutterEngine = flutterEngine;
120120
this.binaryMessenger = binaryMessenger;
121121
this.textureRegistry = textureRegistry;
122-
this.platformViewRegistry = platformViewRegistry;
123122
this.flutterAssets = flutterAssets;
123+
this.platformViewRegistry = platformViewRegistry;
124124
}
125125

126126
@NonNull

‎shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
* <p>{@link io.flutter.embedding.android.FlutterSurfaceView} and {@link
3535
* io.flutter.embedding.android.FlutterTextureView} are implementations of {@link RenderSurface}.
3636
*/
37-
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
3837
public class FlutterRenderer implements TextureRegistry {
3938
private static final String TAG = "FlutterRenderer";
4039

‎shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void setMessageHandler(@Nullable final MessageHandler<T> handler) {
127127
// See https://github.com/flutter/flutter/issues/92582.
128128
if (taskQueue != null) {
129129
messenger.setMessageHandler(
130-
name, handler == null ? null : new IncomingMessageHandler(handler), taskQueue);
130+
name, taskQueue, handler == null ? null : new IncomingMessageHandler(handler));
131131
} else {
132132
messenger.setMessageHandler(
133133
name, handler == null ? null : new IncomingMessageHandler(handler));

‎shell/platform/android/io/flutter/plugin/common/BinaryMessenger.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ default TaskQueue makeBackgroundTaskQueue(TaskQueueOptions options) {
139139
@UiThread
140140
default void setMessageHandler(
141141
@NonNull String channel,
142-
@Nullable BinaryMessageHandler handler,
143-
@Nullable TaskQueue taskQueue) {
142+
@Nullable TaskQueue taskQueue,
143+
@Nullable BinaryMessageHandler handler) {
144144
// TODO(92582): Remove default implementation when it is safe for Google Flutter users.
145145
if (taskQueue != null) {
146146
throw new UnsupportedOperationException(

‎shell/platform/android/io/flutter/plugin/common/EventChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void setStreamHandler(final StreamHandler handler) {
110110
// See https://github.com/flutter/flutter/issues/92582.
111111
if (taskQueue != null) {
112112
messenger.setMessageHandler(
113-
name, handler == null ? null : new IncomingStreamRequestHandler(handler), taskQueue);
113+
name, taskQueue, handler == null ? null : new IncomingStreamRequestHandler(handler));
114114
} else {
115115
messenger.setMessageHandler(
116116
name, handler == null ? null : new IncomingStreamRequestHandler(handler));

‎shell/platform/android/io/flutter/plugin/common/MethodChannel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void setMethodCallHandler(final @Nullable MethodCallHandler handler) {
144144
// See https://github.com/flutter/flutter/issues/92582.
145145
if (taskQueue != null) {
146146
messenger.setMessageHandler(
147-
name, handler == null ? null : new IncomingMethodCallHandler(handler), taskQueue);
147+
name, taskQueue, handler == null ? null : new IncomingMethodCallHandler(handler));
148148
} else {
149149
messenger.setMessageHandler(
150150
name, handler == null ? null : new IncomingMethodCallHandler(handler));

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ public InputConnectionAdaptor(
5656
View view,
5757
int client,
5858
TextInputChannel textInputChannel,
59-
KeyboardDelegate keyboardDelegate,
6059
ListenableEditingState editable,
6160
EditorInfo editorInfo,
62-
FlutterJNI flutterJNI) {
61+
FlutterJNI flutterJNI,
62+
KeyboardDelegate keyboardDelegate) {
6363
super(view, true);
6464
mFlutterView = view;
6565
mClient = client;
@@ -87,10 +87,10 @@ public InputConnectionAdaptor(
8787
View view,
8888
int client,
8989
TextInputChannel textInputChannel,
90-
KeyboardDelegate keyboardDelegate,
9190
ListenableEditingState editable,
92-
EditorInfo editorInfo) {
93-
this(view, client, textInputChannel, keyboardDelegate, editable, editorInfo, new FlutterJNI());
91+
EditorInfo editorInfo,
92+
KeyboardDelegate keyboardDelegate) {
93+
this(view, client, textInputChannel, editable, editorInfo, new FlutterJNI(), keyboardDelegate);
9494
}
9595

9696
private ExtractedText getExtractedText(ExtractedTextRequest request) {

‎shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public InputConnection createInputConnection(
297297

298298
InputConnectionAdaptor connection =
299299
new InputConnectionAdaptor(
300-
view, inputTarget.id, textInputChannel, keyboardManager, mEditable, outAttrs);
300+
view, inputTarget.id, textInputChannel, mEditable, outAttrs, keyboardManager);
301301
outAttrs.initialSelStart = mEditable.getSelectionStart();
302302
outAttrs.initialSelEnd = mEditable.getSelectionEnd();
303303

‎shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java

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

55
package io.flutter.plugin.localization;
66

7+
import android.annotation.SuppressLint;
78
import android.content.Context;
89
import android.content.res.Configuration;
910
import android.content.res.Resources;
@@ -22,6 +23,7 @@ public class LocalizationPlugin {
2223
@NonNull private final LocalizationChannel localizationChannel;
2324
@NonNull private final Context context;
2425

26+
@SuppressLint("AppBundleLocaleChanges") // This is optionally turned on by apps.
2527
@VisibleForTesting
2628
final LocalizationChannel.LocalizationMessageHandler localizationMessageHandler =
2729
new LocalizationChannel.LocalizationMessageHandler() {

‎shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,7 @@ public void onSystemUiVisibilityChange(int visibility) {
243243
private void setSystemChromeEnabledSystemUIMode(PlatformChannel.SystemUiMode systemUiMode) {
244244
int enabledOverlays;
245245

246-
if (systemUiMode == PlatformChannel.SystemUiMode.LEAN_BACK
247-
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
246+
if (systemUiMode == PlatformChannel.SystemUiMode.LEAN_BACK) {
248247
// LEAN BACK
249248
// Available starting at SDK 16
250249
// Should not show overlays, tap to reveal overlays, needs onChange callback

‎shell/platform/android/io/flutter/view/AccessibilityBridge.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2758,6 +2758,7 @@ private SpannableString createSpannableString(String string, List<StringAttribut
27582758
* @param eventOrigin the view in the embedded view's hierarchy that sent the event.
27592759
* @return True if the event was sent.
27602760
*/
2761+
@SuppressLint("SwitchIntDef") // AccessibilityEvent has many irrelevant cases that would be confusing to list.
27612762
public boolean externalViewRequestSendAccessibilityEvent(
27622763
View embeddedView, View eventOrigin, AccessibilityEvent event) {
27632764
if (!accessibilityViewEmbedder.requestSendAccessibilityEvent(

‎shell/platform/android/io/flutter/view/AccessibilityViewEmbedder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ private static class ReflectionAccessors {
434434
private @Nullable final Field childNodeIdsField;
435435
private @Nullable final Method longArrayGetIndex;
436436

437-
@SuppressLint("PrivateApi")
437+
@SuppressLint("DiscouragedPrivateApi,PrivateApi")
438438
private ReflectionAccessors() {
439439
Method getSourceNodeId = null;
440440
Method getParentNodeId = null;

‎shell/platform/android/io/flutter/view/FlutterNativeView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public void setMessageHandler(String channel, BinaryMessageHandler handler) {
159159

160160
@Override
161161
@UiThread
162-
public void setMessageHandler(String channel, BinaryMessageHandler handler, TaskQueue taskQueue) {
163-
dartExecutor.getBinaryMessenger().setMessageHandler(channel, handler, taskQueue);
162+
public void setMessageHandler(String channel, TaskQueue taskQueue, BinaryMessageHandler handler) {
163+
dartExecutor.getBinaryMessenger().setMessageHandler(channel, taskQueue, handler);
164164
}
165165

166166
@Override

‎shell/platform/android/io/flutter/view/FlutterView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -872,9 +872,9 @@ public void setMessageHandler(@NonNull String channel, @NonNull BinaryMessageHan
872872
@UiThread
873873
public void setMessageHandler(
874874
@NonNull String channel,
875-
@NonNull BinaryMessageHandler handler,
876-
@NonNull TaskQueue taskQueue) {
877-
mNativeView.setMessageHandler(channel, handler, taskQueue);
875+
@NonNull TaskQueue taskQueue,
876+
@NonNull BinaryMessageHandler handler) {
877+
mNativeView.setMessageHandler(channel, taskQueue, handler);
878878
}
879879

880880
/** Listener will be called on the Android UI thread once when Flutter renders the first frame. */

‎shell/platform/android/test/io/flutter/embedding/engine/dart/DartMessengerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void itHandlesErrors() {
7171
.when(throwingHandler)
7272
.onMessage(any(ByteBuffer.class), any(DartMessenger.Reply.class));
7373
BinaryMessenger.TaskQueue taskQueue = messenger.makeBackgroundTaskQueue();
74-
messenger.setMessageHandler("test", throwingHandler, taskQueue);
74+
messenger.setMessageHandler("test", taskQueue, throwingHandler);
7575
messenger.handleMessageFromDart("test", ByteBuffer.allocate(0), 0, 0);
7676
assertNotNull(reportingHandler.latestException);
7777
assertTrue(reportingHandler.latestException instanceof AssertionError);
@@ -91,7 +91,7 @@ public void givesDirectByteBuffer() {
9191
wasDirect[0] = message.isDirect();
9292
};
9393
BinaryMessenger.TaskQueue taskQueue = messenger.makeBackgroundTaskQueue();
94-
messenger.setMessageHandler(channel, handler, taskQueue);
94+
messenger.setMessageHandler(channel, taskQueue, handler);
9595
final ByteBuffer message = ByteBuffer.allocateDirect(4 * 2);
9696
message.rewind();
9797
message.putChar('a');
@@ -117,7 +117,7 @@ public void directByteBufferLimitZeroAfterUsage() {
117117
assertEquals(bufferSize, byteBuffers[0].limit());
118118
};
119119
BinaryMessenger.TaskQueue taskQueue = messenger.makeBackgroundTaskQueue();
120-
messenger.setMessageHandler(channel, handler, taskQueue);
120+
messenger.setMessageHandler(channel, taskQueue, handler);
121121
final ByteBuffer message = ByteBuffer.allocateDirect(bufferSize);
122122
message.rewind();
123123
message.putChar('a');
@@ -195,7 +195,7 @@ public void cleansUpMessageDataOnError() throws InterruptedException {
195195
(ByteBuffer message, BinaryMessenger.BinaryReply reply) -> {
196196
throw new RuntimeException("hello");
197197
};
198-
messenger.setMessageHandler(channel, handler, taskQueue);
198+
messenger.setMessageHandler(channel, taskQueue, handler);
199199
final ByteBuffer message = ByteBuffer.allocateDirect(4 * 2);
200200
final int replyId = 1;
201201
final long messageData = 1234;
@@ -240,7 +240,7 @@ public void buffersResponseWhenHandlerIsNotSet() throws InterruptedException {
240240
(ByteBuffer msg, BinaryMessenger.BinaryReply reply) -> {
241241
reply.reply(ByteBuffer.wrap("done".getBytes()));
242242
};
243-
messenger.setMessageHandler(channel, handler, taskQueue);
243+
messenger.setMessageHandler(channel, taskQueue, handler);
244244

245245
shadowOf(getMainLooper()).idle();
246246
verify(fakeFlutterJni, never()).invokePlatformMessageEmptyResponseCallback(eq(replyId));
@@ -293,7 +293,7 @@ public void emptyResponseWhenHandlerIsUnregistered() throws InterruptedException
293293
(ByteBuffer msg, BinaryMessenger.BinaryReply reply) -> {
294294
reply.reply(ByteBuffer.wrap("done".getBytes()));
295295
};
296-
messenger.setMessageHandler(channel, handler, taskQueue);
296+
messenger.setMessageHandler(channel, taskQueue, handler);
297297

298298
shadowOf(getMainLooper()).idle();
299299
verify(fakeFlutterJni, never()).invokePlatformMessageEmptyResponseCallback(eq(replyId));

0 commit comments

Comments
 (0)