Fix lint errors to prepare for building Android files in Google (flut…

…ter#5440)
Eistrong · Jun 1, 2018 · d7e3f2d · d7e3f2d
1 parent bc79499
commit d7e3f2d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -205,7 +205,7 @@ public void onPause() {
         Application app = (Application) activity.getApplicationContext();
         if (app instanceof FlutterApplication) {
             FlutterApplication flutterApp = (FlutterApplication) app;
-            if (this.equals(flutterApp.getCurrentActivity())) {
+            if (activity.equals(flutterApp.getCurrentActivity())) {
                 Log.i(TAG, "onPause setting current activity to null");
                 flutterApp.setCurrentActivity(null);
             }
@@ -251,7 +251,7 @@ public void onDestroy() {
         Application app = (Application) activity.getApplicationContext();
         if (app instanceof FlutterApplication) {
             FlutterApplication flutterApp = (FlutterApplication) app;
-            if (this.equals(flutterApp.getCurrentActivity())) {
+            if (activity.equals(flutterApp.getCurrentActivity())) {
                 Log.i(TAG, "onDestroy setting current activity to null");
                 flutterApp.setCurrentActivity(null);
             }

diff --git a/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java b/shell/platform/android/io/flutter/plugin/common/StandardMethodCodec.java
@@ -84,6 +84,7 @@ public Object decodeEnvelope(ByteBuffer envelope) {
                     return result;
                 }
             }
+            // Falls through intentionally.
             case 1: {
                 final Object code = messageCodec.readValue(envelope);
                 final Object message = messageCodec.readValue(envelope);

diff --git a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
@@ -91,8 +91,7 @@ public boolean commitText(CharSequence text, int newCursorPosition) {
 
     @Override
     public boolean deleteSurroundingText(int beforeLength, int afterLength) {
-        if (Selection.getSelectionStart(mEditable) == -1 ||
-            Selection.getSelectionStart(mEditable) == -1)
+        if (Selection.getSelectionStart(mEditable) == -1)
             return true;
 
         boolean result = super.deleteSurroundingText(beforeLength, afterLength);

diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -424,6 +424,7 @@ public AccessibilityNodeInfo findFocus(int focus) {
                 if (mInputFocusedObject != null)
                     return createAccessibilityNodeInfo(mInputFocusedObject.id);
             }
+            // Fall through to check FOCUS_ACCESSIBILITY
             case AccessibilityNodeInfo.FOCUS_ACCESSIBILITY: {
                 if (mA11yFocusedObject != null)
                     return createAccessibilityNodeInfo(mA11yFocusedObject.id);