diff --git a/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/examples/androidapp/src/org/appspot/apprtc/CallActivity.java index eb5ee8289e..3a4452a87b 100644 --- a/examples/androidapp/src/org/appspot/apprtc/CallActivity.java +++ b/examples/androidapp/src/org/appspot/apprtc/CallActivity.java @@ -360,7 +360,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven // For command line execution run connection for and exit. if (commandLineRun && runTimeMs > 0) { - (new Handler()).postDelayed(new Runnable() { + new Handler().postDelayed(new Runnable() { @Override public void run() { disconnect(); diff --git a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java index 7206c88498..8de3d60243 100644 --- a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java +++ b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java @@ -360,7 +360,7 @@ public class ConnectActivity extends Activity { // roomId is random for loopback. if (loopback) { - roomId = Integer.toString((new Random()).nextInt(100000000)); + roomId = Integer.toString(new Random().nextInt(100000000)); } String roomUrl = sharedPref.getString( diff --git a/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java b/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java index 6a0f235528..b00589439b 100644 --- a/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java +++ b/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java @@ -98,7 +98,7 @@ public class RoomParametersFetcher { String clientId = roomJson.getString("client_id"); String wssUrl = roomJson.getString("wss_url"); String wssPostUrl = roomJson.getString("wss_post_url"); - boolean initiator = (roomJson.getBoolean("is_initiator")); + boolean initiator = roomJson.getBoolean("is_initiator"); if (!initiator) { iceCandidates = new ArrayList<>(); String messagesString = roomJson.getString("messages"); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java index 4cee3bdf71..b067909a8d 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java @@ -51,8 +51,8 @@ public class GlRectDrawerTest { int width, int height, ByteBuffer actual, ByteBuffer expected) { actual.rewind(); expected.rewind(); - assertEquals(actual.remaining(), width * height * 3); - assertEquals(expected.remaining(), width * height * 3); + assertEquals(actual.remaining(), width * ((long) height) * 3L); + assertEquals(expected.remaining(), width * ((long) height) * 3L); for (int y = 0; y < height; ++y) { for (int x = 0; x < width; ++x) { final int actualR = actual.get() & 0xFF; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java index 64b1ac0573..47d6f089a6 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java @@ -518,13 +518,13 @@ public class PeerConnectionEndToEndTest { // stall a wait). Use callbacks to fire off dependent steps instead of // explicitly waiting, so there can be just a single wait at the end of // the test. - long endTime = System.currentTimeMillis() + 1000 * timeoutSeconds; + long endTime = System.currentTimeMillis() + 1000L * timeoutSeconds; TreeSet prev = null; TreeSet stillWaitingForExpectations = unsatisfiedExpectations(); while (!stillWaitingForExpectations.isEmpty()) { if (!stillWaitingForExpectations.equals(prev)) { Logging.d(TAG, - name + " still waiting at\n " + (new Throwable()).getStackTrace()[1] + name + " still waiting at\n " + new Throwable().getStackTrace()[1] + "\n for: " + Arrays.toString(stillWaitingForExpectations.toArray())); } if (endTime < System.currentTimeMillis()) { @@ -543,7 +543,7 @@ public class PeerConnectionEndToEndTest { } if (prev == null) { Logging.d( - TAG, name + " didn't need to wait at\n " + (new Throwable()).getStackTrace()[1]); + TAG, name + " didn't need to wait at\n " + new Throwable().getStackTrace()[1]); } return true; } @@ -1645,7 +1645,7 @@ public class PeerConnectionEndToEndTest { Logging.d(TAG, "FYI stats: "); int reportIndex = -1; for (StatsReport[] reports : expectations.takeStatsReports()) { - Logging.d(TAG, " Report #" + (++reportIndex)); + Logging.d(TAG, " Report #" + ++reportIndex); for (int i = 0; i < reports.length; ++i) { Logging.d(TAG, " " + reports[i].toString()); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java b/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java index 3668cd71b1..43f5acea0a 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/VideoFrameBufferTest.java @@ -391,7 +391,7 @@ public class VideoFrameBufferTest { final List pixelDiffs = getPixelDiffs(bufferA, bufferB); long sse = 0; for (int pixelDiff : pixelDiffs) { - sse += pixelDiff * pixelDiff; + sse += pixelDiff * ((long) pixelDiff); } return sseToPsnr(sse, pixelDiffs.size()); }