filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errorprone warnings that should be errors am: 50b73ca58a

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

Change-Id: Ic88f3392fb80e1d1377c9442f1da817bc0444192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-10-17 01:05:07 +00:00
committed by Automerger Merge Worker
parent 1b37d166b3 50b73ca58a
commit f812cb353b
7 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/support/v7/mms/DefaultApnSettingsLoader.java
View File

@@ -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;
}

1
src/android/support/v7/mms/pdu/EncodedStringValue.java
View File

@@ -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);

2
src/com/android/messaging/datamodel/DatabaseWrapper.java
View File

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

1
src/com/android/messaging/mmslib/pdu/EncodedStringValue.java
View File

@@ -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);

1
src/com/android/messaging/ui/conversation/ConversationActivity.java
View File

@@ -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) {

1
src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java
View File

@@ -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) {
}

6
tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java
View File

@@ -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");
}
}