Fix errorprone warnings that should be errors am: 50b73ca5 am: f812cb35

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2255931



Change-Id: Id8f5515bcdc63cc1f354d468eb4bcd9ca9fed515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/android/support/v7/mms/DefaultApnSettingsLoader.java

@@ -394,7 +394,7 @@ class DefaultApnSettingsLoader implements ApnSettingsLoader {
     private void loadFromResources(final int subId, final String apnName, final List<Apn> apns) {
         Log.i(MmsService.TAG, "Loading APNs from resources, apnName=" + apnName);
         final int[] mccMnc = Utils.getMccMnc(mContext, subId);
-        if (mccMnc[0] == 0 && mccMnc[0] == 0) {
+        if (mccMnc[0] == 0) {
             Log.w(MmsService.TAG, "Can not get valid mcc/mnc from system");
             return;
         }

src/android/support/v7/mms/pdu/EncodedStringValue.java

@@ -188,7 +188,6 @@ public class EncodedStringValue implements Cloneable {
      */
     @Override
     public Object clone() throws CloneNotSupportedException {
-        super.clone();
         int len = mData.length;
         byte[] dstBytes = new byte[len];
         System.arraycopy(mData, 0, dstBytes, 0, len);

src/com/android/messaging/datamodel/DatabaseWrapper.java

@@ -190,7 +190,7 @@ public class DatabaseWrapper {
         }
         if (mLog) {
             printTiming(t1, String.format(Locale.US,
-                    "insertWithOnConflict with ", searchTable));
+                    "insertWithOnConflict with %s", searchTable));
         }
     }
 

src/com/android/messaging/mmslib/pdu/EncodedStringValue.java

@@ -203,7 +203,6 @@ public class EncodedStringValue implements Cloneable {
      */
     @Override
     public Object clone() throws CloneNotSupportedException {
-        super.clone();
         int len = mData.length;
         byte[] dstBytes = new byte[len];
         System.arraycopy(mData, 0, dstBytes, 0, len);

src/com/android/messaging/ui/conversation/ConversationActivity.java

@@ -360,6 +360,7 @@ public class ConversationActivity extends BugleActionBarActivity
         return mUiState.shouldResumeComposeMessage();
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: fix me
     @Override
     protected void onActivityResult(final int requestCode, final int resultCode,
             final Intent data) {

src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java

@@ -105,6 +105,7 @@ public abstract class AbstractConversationListActivity  extends BugleActionBarAc
         return isInConversationListSelectMode();
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: fix me
     @Override
     public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
     }

tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java

@@ -44,10 +44,14 @@ public class CameraManagerTest extends BugleTestCase {
         CameraManager.setCameraWrapper(MockCameraFactory.createCameraWrapper());
         assertEquals(false, CameraManager.get().hasAnyCamera());
         assertEquals(false, CameraManager.get().hasFrontAndBackCamera());
+        boolean threw = false;
         try {
             CameraManager.get().selectCamera(CameraInfo.CAMERA_FACING_BACK);
-            fail("selectCamera should have thrown");
         } catch (AssertionError e) {
+            threw = true;
+        }
+        if (!threw) {
+            fail("selectCamera should have thrown");
         }
     }