From dff56c34970dbf7bcba0206c3bc2b3d2510918aa Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Fri, 13 Oct 2017 19:55:07 -0700
Subject: [PATCH] Android Studio code analyzer fixes

---
 .../src/org/libsdl/app/SDLActivity.java       | 37 ++++++-------------
 .../src/org/libsdl/app/SDLAudioManager.java   |  1 -
 .../org/libsdl/app/SDLControllerManager.java  |  6 +--
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index ae18c572bbd0f..9119473f534fd 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -2,12 +2,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 import java.lang.reflect.Method;
+import java.util.Objects;
 
 import android.app.*;
 import android.content.*;
@@ -26,7 +23,6 @@
 import android.util.SparseArray;
 import android.graphics.*;
 import android.graphics.drawable.Drawable;
-import android.media.*;
 import android.hardware.*;
 import android.content.pm.ActivityInfo;
 
@@ -400,7 +396,6 @@ public void run() {
                 mSurface.handleResume();
                 mCurrentNativeState = mNextNativeState;
             }
-            return;
         }
     }
 
@@ -547,7 +542,7 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
     {
       int orientation = -1;
 
-      if (hint != "") {
+      if (!Objects.equals(hint, "")) {
          if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
             orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
          } else if (hint.contains("LandscapeRight")) {
@@ -580,8 +575,6 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
       if (orientation != -1) {
          mSingleton.setRequestedOrientation(orientation);
       }
- 
-      return;
     }
 
 
@@ -590,20 +583,17 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
      */
     public static boolean isScreenKeyboardShown() 
     {
-       if (mTextEdit == null) {
-          return false;
-       }
+        if (mTextEdit == null) {
+            return false;
+        }
 
-       if (mScreenKeyboardShown == false) {
-          return false;
-       }
+        if (!mScreenKeyboardShown) {
+            return false;
+        }
 
-       InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-       if (imm.isAcceptingText()) {
-          return true;
-       }
+        InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        return imm.isAcceptingText();
 
-       return false;
     }
 
     /**
@@ -681,10 +671,7 @@ public static boolean isTextInputEvent(KeyEvent event) {
             }  
         }
 
-        if (event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE) {
-            return true;
-        }
-        return false;
+        return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
     }
 
     /**
@@ -1010,7 +997,6 @@ public static String clipboardGetText() {
      */
     public static void clipboardSetText(String string) {
         mClipboardHandler.clipboardSetText(string);
-        return;
     }
 
 }
@@ -1604,7 +1590,6 @@ public String clipboardGetText() {
     @Override
     public void clipboardSetText(String string) {
        mClipMgrOld.setText(string);
-       return;
     }
 }
 
diff --git a/android-project/src/org/libsdl/app/SDLAudioManager.java b/android-project/src/org/libsdl/app/SDLAudioManager.java
index 66c3fea422f19..26baf8220a9bc 100644
--- a/android-project/src/org/libsdl/app/SDLAudioManager.java
+++ b/android-project/src/org/libsdl/app/SDLAudioManager.java
@@ -1,7 +1,6 @@
 package org.libsdl.app;
 
 import android.media.*;
-import android.hardware.*;
 import android.util.Log;
 
 public class SDLAudioManager
diff --git a/android-project/src/org/libsdl/app/SDLControllerManager.java b/android-project/src/org/libsdl/app/SDLControllerManager.java
index ef946acd59d75..36294422fc362 100644
--- a/android-project/src/org/libsdl/app/SDLControllerManager.java
+++ b/android-project/src/org/libsdl/app/SDLControllerManager.java
@@ -1,14 +1,12 @@
 package org.libsdl.app;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
-import android.app.*;
 import android.content.Context;
-import android.hardware.*;
 import android.os.*;
 import android.view.*;
 import android.util.Log;
@@ -268,7 +266,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler_API12 {
     public String getJoystickDescriptor(InputDevice joystickDevice) {
         String desc = joystickDevice.getDescriptor();
 
-        if (desc != null && desc != "") {
+        if (desc != null && !Objects.equals(desc, "")) {
             return desc;
         }