diff options
7 files changed, 9 insertions, 5 deletions
diff --git a/src/android/support/v7/mms/DefaultApnSettingsLoader.java b/src/android/support/v7/mms/DefaultApnSettingsLoader.java index 2c2ba67..a4bd647 100644 --- a/src/android/support/v7/mms/DefaultApnSettingsLoader.java +++ b/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; } diff --git a/src/android/support/v7/mms/pdu/EncodedStringValue.java b/src/android/support/v7/mms/pdu/EncodedStringValue.java index 5ae1e43..0a5d2be 100644 --- a/src/android/support/v7/mms/pdu/EncodedStringValue.java +++ b/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); diff --git a/src/com/android/messaging/datamodel/DatabaseWrapper.java b/src/com/android/messaging/datamodel/DatabaseWrapper.java index ca7a331..c08d5aa 100644 --- a/src/com/android/messaging/datamodel/DatabaseWrapper.java +++ b/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)); } } diff --git a/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java b/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java index 1d3c9ea..5870027 100644 --- a/src/com/android/messaging/mmslib/pdu/EncodedStringValue.java +++ b/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); diff --git a/src/com/android/messaging/ui/conversation/ConversationActivity.java b/src/com/android/messaging/ui/conversation/ConversationActivity.java index be94460..d8d3157 100644 --- a/src/com/android/messaging/ui/conversation/ConversationActivity.java +++ b/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) { diff --git a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java index f3de0ab..a2b0bdf 100644 --- a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java +++ b/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) { } diff --git a/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java b/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java index 951c694..e81a548 100644 --- a/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java +++ b/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"); } } |