Address android lint issues part 1

Bug: 19354960 Change-Id: I321fa0007b84fbd7c8378c986fe142fc9fde9d4a
EnjoyAndroid · Mar 10, 2015 · 305cf0b · 305cf0b
1 parent c657c89
commit 305cf0b
Show file tree

Hide file tree

Showing 32 changed files with 116 additions and 143 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0-rc4'
+        classpath 'com.android.tools.build:gradle:1.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "com.example.android.uamp"
@@ -50,9 +50,9 @@ repositories {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     wearApp project(':wear')
-    compile 'com.google.android.gms:play-services:6.1.71'
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.google.android.gms:play-services:6.5.87'
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:cardview-v7:21.0.2'
     compile 'com.android.support:leanback-v17:21.0.2'
     compile 'com.android.support:mediarouter-v7:21.0.2'

diff --git a/mobile/src/main/java/com/example/android/uamp/CastPlayback.java b/mobile/src/main/java/com/example/android/uamp/CastPlayback.java
@@ -34,12 +34,9 @@
 import com.google.sample.castcompanionlibrary.cast.exceptions.NoConnectionException;
 import com.google.sample.castcompanionlibrary.cast.exceptions.TransientNetworkDisconnectionException;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.List;
-
 /**
  * An implementation of Playback that talks to Cast.
  */

diff --git a/mobile/src/main/java/com/example/android/uamp/MusicService.java b/mobile/src/main/java/com/example/android/uamp/MusicService.java
@@ -16,43 +16,42 @@
 
 package com.example.android.uamp;
 
- import android.app.PendingIntent;
- import android.content.Context;
- import android.content.Intent;
- import android.graphics.Bitmap;
- import android.media.MediaDescription;
- import android.media.MediaMetadata;
- import android.media.browse.MediaBrowser;
- import android.media.browse.MediaBrowser.MediaItem;
- import android.media.session.MediaSession;
- import android.media.session.PlaybackState;
- import android.net.Uri;
- import android.os.Bundle;
- import android.os.Handler;
- import android.os.Message;
- import android.os.SystemClock;
- import android.service.media.MediaBrowserService;
- import android.support.v7.media.MediaRouter;
-
- import com.example.android.uamp.model.MusicProvider;
- import com.example.android.uamp.ui.NowPlayingActivity;
- import com.example.android.uamp.utils.CarHelper;
- import com.example.android.uamp.utils.LogHelper;
- import com.example.android.uamp.utils.MediaIDHelper;
- import com.example.android.uamp.utils.QueueHelper;
- import com.google.android.gms.cast.ApplicationMetadata;
- import com.google.android.gms.cast.CastDevice;
- import com.google.sample.castcompanionlibrary.cast.VideoCastManager;
- import com.google.sample.castcompanionlibrary.cast.callbacks.VideoCastConsumerImpl;
-
- import java.lang.ref.WeakReference;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
-
- import static com.example.android.uamp.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE;
- import static com.example.android.uamp.utils.MediaIDHelper.MEDIA_ID_ROOT;
- import static com.example.android.uamp.utils.MediaIDHelper.createBrowseCategoryMediaID;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.media.MediaDescription;
+import android.media.MediaMetadata;
+import android.media.browse.MediaBrowser;
+import android.media.browse.MediaBrowser.MediaItem;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.SystemClock;
+import android.service.media.MediaBrowserService;
+import android.support.v7.media.MediaRouter;
+
+import com.example.android.uamp.model.MusicProvider;
+import com.example.android.uamp.ui.NowPlayingActivity;
+import com.example.android.uamp.utils.CarHelper;
+import com.example.android.uamp.utils.LogHelper;
+import com.example.android.uamp.utils.MediaIDHelper;
+import com.example.android.uamp.utils.QueueHelper;
+import com.google.android.gms.cast.ApplicationMetadata;
+import com.google.sample.castcompanionlibrary.cast.VideoCastManager;
+import com.google.sample.castcompanionlibrary.cast.callbacks.VideoCastConsumerImpl;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.example.android.uamp.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE;
+import static com.example.android.uamp.utils.MediaIDHelper.MEDIA_ID_ROOT;
+import static com.example.android.uamp.utils.MediaIDHelper.createBrowseCategoryMediaID;
 
 /**
  * This class provides a MediaBrowser through a service. It exposes the media library to a browsing

diff --git a/mobile/src/main/java/com/example/android/uamp/PackageValidator.java b/mobile/src/main/java/com/example/android/uamp/PackageValidator.java
@@ -48,6 +48,7 @@ public static void checkCallerAllowed(Context context, String callingPackage, in
     /**
      * @return false if the caller is not authorized to get data from this MediaBrowserService
      */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public static boolean isCallerAllowed(Context context, String callingPackage, int callingUid) {
         // Always allow calls from the framework, self app or development environment.
         if (Process.SYSTEM_UID == callingUid || Process.myUid() == callingUid) {

diff --git a/mobile/src/main/java/com/example/android/uamp/hardware/DemoKitManager.java b/mobile/src/main/java/com/example/android/uamp/hardware/DemoKitManager.java
@@ -32,7 +32,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.ref.WeakReference;
 
 public class DemoKitManager implements Runnable {
     private static final String TAG = LogHelper.makeLogTag(DemoKitManager.class);
@@ -43,8 +42,6 @@ public class DemoKitManager implements Runnable {
     private PendingIntent mPermissionIntent;
     private boolean mPermissionRequestPending;
 
-    private WeakReference<Context> mContext;
-
     UsbAccessory mAccessory;
     ParcelFileDescriptor mFileDescriptor;
     FileInputStream mInputStream;
@@ -120,7 +117,6 @@ public int getY() {
     }
 
     public DemoKitManager(Context context) {
-        mContext = new WeakReference<Context>(context);
         mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
     }
 
@@ -151,7 +147,7 @@ public void closeAccessory() {
             if (mFileDescriptor != null) {
                 mFileDescriptor.close();
             }
-        } catch (IOException e) {
+        } catch (IOException ignored) {
         } finally {
             mFileDescriptor = null;
             mAccessory = null;
@@ -270,6 +266,7 @@ public void handleMessage(Message msg) {
         }
     };
 
+    @SuppressWarnings("SameParameterValue")
     public void sendCommand(byte command, byte target, int value) throws IOException {
         byte[] buffer = new byte[3];
         if (value > 255)

diff --git a/mobile/src/main/java/com/example/android/uamp/hardware/DemoKitService.java b/mobile/src/main/java/com/example/android/uamp/hardware/DemoKitService.java
@@ -131,7 +131,7 @@ private void startForegroundService() {
     public void onDestroy() {
         super.onDestroy();
         LogHelper.d(TAG, "Destroying service");
-        if (mMediaController != null && mMediaCallback != null) {
+        if (mMediaController != null) {
             mMediaController.unregisterCallback(mMediaCallback);
         }
         if (mMediaBrowser != null && mMediaBrowser.isConnected()) {

diff --git a/mobile/src/main/java/com/example/android/uamp/model/MusicProvider.java b/mobile/src/main/java/com/example/android/uamp/model/MusicProvider.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -227,7 +228,6 @@ private void retrieveMediaAsync(Callback callback) {
                 if (tracks != null) {
                     for (int j = 0; j < tracks.length(); j++) {
                         MediaMetadata item = buildFromJSON(tracks.getJSONObject(j), path);
-                        String genre = item.getString(MediaMetadata.METADATA_KEY_GENRE);
                         String musicId = item.getString(MediaMetadata.METADATA_KEY_MEDIA_ID);
                         mMusicListById.put(musicId, new MutableMediaMetadata(musicId, item));
                     }
@@ -302,13 +302,13 @@ private MediaMetadata buildFromJSON(JSONObject json, String basePath) throws JSO
     private JSONObject parseUrl(String urlString) {
         InputStream is = null;
         try {
-            java.net.URL url = new java.net.URL(urlString);
+            URL url = new URL(urlString);
             URLConnection urlConnection = url.openConnection();
             is = new BufferedInputStream(urlConnection.getInputStream());
             BufferedReader reader = new BufferedReader(new InputStreamReader(
                     urlConnection.getInputStream(), "iso-8859-1"));
             StringBuilder sb = new StringBuilder();
-            String line = null;
+            String line;
             while ((line = reader.readLine()) != null) {
                 sb.append(line);
             }

diff --git a/mobile/src/main/java/com/example/android/uamp/model/MutableMediaMetadata.java b/mobile/src/main/java/com/example/android/uamp/model/MutableMediaMetadata.java
@@ -17,6 +17,7 @@
 package com.example.android.uamp.model;
 
 import android.media.MediaMetadata;
+import android.text.TextUtils;
 
 /**
  * Holder class that encapsulates a MediaMetadata and allows the actual metadata to be modified
@@ -39,9 +40,7 @@ public boolean equals(Object o) {
 
         MutableMediaMetadata that = (MutableMediaMetadata) o;
 
-        if (trackId != null ? !trackId.equals(that.trackId) : that.trackId != null) return false;
-
-        return true;
+        return TextUtils.equals(trackId, that.trackId);
     }
 
     @Override

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/ActionBarCastActivity.java b/mobile/src/main/java/com/example/android/uamp/ui/ActionBarCastActivity.java
@@ -229,7 +229,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onBackPressed() {
         // If the drawer is open, back will close it
-        if (mDrawerLayout.isDrawerOpen(Gravity.START | Gravity.LEFT)) {
+        if (mDrawerLayout.isDrawerOpen(Gravity.START)) {
             mDrawerLayout.closeDrawers();
             return;
         }

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/MediaItemViewHolder.java b/mobile/src/main/java/com/example/android/uamp/ui/MediaItemViewHolder.java
@@ -18,15 +18,13 @@
 import android.app.Activity;
 import android.graphics.drawable.AnimationDrawable;
 import android.media.MediaDescription;
-import android.media.session.MediaController;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.example.android.uamp.R;
-import com.example.android.uamp.utils.MediaIDHelper;
 
 public class MediaItemViewHolder {
 

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/NowPlayingActivity.java b/mobile/src/main/java/com/example/android/uamp/ui/NowPlayingActivity.java
@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.example.android.uamp.ui.tv.TvBrowseActivity;
 import com.example.android.uamp.ui.tv.TvNowPlayingActivity;
 import com.example.android.uamp.utils.LogHelper;
 

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/tv/CardPresenter.java b/mobile/src/main/java/com/example/android/uamp/ui/tv/CardPresenter.java
@@ -31,10 +31,10 @@
 
 public class CardPresenter extends Presenter {
     private static final String TAG = "CardPresenter";
+    private static final int CARD_WIDTH = 313;
+    private static final int CARD_HEIGHT = 176;
 
     private static Context mContext;
-    private static int CARD_WIDTH = 313;
-    private static int CARD_HEIGHT = 176;
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent) {

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/tv/MediaDetailsActivity.java b/mobile/src/main/java/com/example/android/uamp/ui/tv/MediaDetailsActivity.java
@@ -19,7 +19,6 @@
 import android.os.Bundle;
 
 import com.example.android.uamp.R;
-import com.example.android.uamp.utils.LogHelper;
 
 public class MediaDetailsActivity extends Activity {
 

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/tv/MediaDetailsFragment.java b/mobile/src/main/java/com/example/android/uamp/ui/tv/MediaDetailsFragment.java
@@ -33,9 +33,6 @@
 import android.support.v17.leanback.widget.ListRow;
 import android.support.v17.leanback.widget.ListRowPresenter;
 import android.support.v17.leanback.widget.OnActionClickedListener;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Toast;
 
 import com.example.android.uamp.R;
@@ -48,7 +45,6 @@ public class MediaDetailsFragment extends DetailsFragment {
     private Activity mActivity;
     private MediaBrowser.MediaItem mMediaItem;
     private ArrayObjectAdapter mRowsAdapter;
-    private ArrayObjectAdapter mRelatedAdapter;
 
     @Override
     public void onAttach(Activity activity) {
@@ -87,9 +83,9 @@ private void buildDetails() {
     }
 
     private void addRelatedContentRow() {
-        mRelatedAdapter = new ArrayObjectAdapter(new CardPresenter());
+        ArrayObjectAdapter relatedAdapter = new ArrayObjectAdapter(new CardPresenter());
         HeaderItem headerItem = new HeaderItem(0, getString(R.string.related_content_header), null);
-        ListRow relatedContentRow = new ListRow(headerItem, mRelatedAdapter);
+        ListRow relatedContentRow = new ListRow(headerItem, relatedAdapter);
         mRowsAdapter.add(relatedContentRow);
     }
 

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/tv/MusicPlaybackOverlayFragment.java b/mobile/src/main/java/com/example/android/uamp/ui/tv/MusicPlaybackOverlayFragment.java
@@ -15,7 +15,6 @@
  */
 package com.example.android.uamp.ui.tv;
 
-import android.app.Activity;
 import android.content.Context;
 import android.media.MediaMetadata;
 import android.media.session.MediaController;
@@ -27,12 +26,9 @@
 import android.support.v17.leanback.widget.ArrayObjectAdapter;
 import android.support.v17.leanback.widget.ClassPresenterSelector;
 import android.support.v17.leanback.widget.ControlButtonPresenterSelector;
-import android.support.v17.leanback.widget.ListRow;
-import android.support.v17.leanback.widget.ListRowPresenter;
 import android.support.v17.leanback.widget.OnActionClickedListener;
 import android.support.v17.leanback.widget.PlaybackControlsRow;
 import android.support.v17.leanback.widget.PlaybackControlsRowPresenter;
-import android.support.v17.leanback.widget.RowHeaderPresenter;
 import android.util.Log;
 
 import com.example.android.uamp.utils.LogHelper;
@@ -67,12 +63,6 @@ public class MusicPlaybackOverlayFragment extends PlaybackOverlayFragment {
     private long mDuration;
     private long mPosition;
 
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Log.i(TAG, "onCreate");
@@ -113,11 +103,6 @@ private void addPlaybackControlsRow() {
         mPrimaryActionsAdapter.add(mSkipNextAction);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
     @Override
     public void onStop() {
         super.onStop();

diff --git a/mobile/src/main/java/com/example/android/uamp/ui/tv/TvBrowseActivity.java b/mobile/src/main/java/com/example/android/uamp/ui/tv/TvBrowseActivity.java
@@ -40,10 +40,11 @@ public class TvBrowseActivity extends Activity
         implements TvBrowseFragment.MediaFragmentListener {
 
     private static final String TAG = LogHelper.makeLogTag(TvBrowseActivity.class);
-    public static final String EXTRA_PLAY_QUERY="com.example.android.uamp.PLAY_QUERY";
     private static final String SAVED_MEDIA_ID="com.example.android.uamp.MEDIA_ID";
     private static final String BROWSE_TITLE = "com.example.android.uamp.BROWSE_TITLE";
 
+    public static final String EXTRA_PLAY_QUERY="com.example.android.uamp.PLAY_QUERY";
+
     private MediaBrowser mMediaBrowser;
 
     private String mMediaId;
@@ -64,6 +65,7 @@ public void onCreate(Bundle savedInstanceState) {
                 mConnectionCallback, null);
     }
 
+    @SuppressWarnings("NullableProblems")
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         if (mMediaId != null) {
@@ -100,7 +102,6 @@ protected void bootstrapFromParameters(Bundle savedInstanceState) {
             if (mediaId != null) {
                 mMediaId = mediaId;
                 mBrowseTitle = intent.getStringExtra(TvBrowseActivity.BROWSE_TITLE);
-                return;
             } else if (intent.getAction() != null &&
                     intent.getAction().equals(MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH) &&
                     intent.hasExtra(EXTRA_PLAY_QUERY)) {