From a01f34cdf16fe0ac5039614d9f4a37ca9e952008 Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@webrtc.org>
Date: Mon, 9 Dec 2024 11:14:47 +0100
Subject: [PATCH] Suppress "UnusedMethod" warning on methods only used on
 native code.

Change-Id: Ide048fd06d20b6a7a7ef0f74db9d6d267ab61f01
Bug: webrtc:383026404
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370740
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43514}
---
 sdk/android/api/org/webrtc/EncodedImage.java    |  7 +++++++
 .../api/org/webrtc/NetworkChangeDetector.java   |  6 ++++++
 sdk/android/api/org/webrtc/RTCStatsReport.java  |  2 +-
 .../src/org/webrtc/NetworkMonitorTest.java      | 17 -----------------
 .../webrtc/native_test/NativeTestWebrtc.java    |  1 +
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java
index a6eef67da8..849a602487 100644
--- a/sdk/android/api/org/webrtc/EncodedImage.java
+++ b/sdk/android/api/org/webrtc/EncodedImage.java
@@ -82,36 +82,43 @@ public class EncodedImage implements RefCounted {
     this.refCountDelegate = new RefCountDelegate(releaseCallback);
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private ByteBuffer getBuffer() {
     return buffer;
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private int getEncodedWidth() {
     return encodedWidth;
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private int getEncodedHeight() {
     return encodedHeight;
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private long getCaptureTimeNs() {
     return captureTimeNs;
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private int getFrameType() {
     return frameType.getNative();
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private int getRotation() {
     return rotation;
   }
 
+  @SuppressWarnings("UnusedMethod")
   @CalledByNative
   private @Nullable Integer getQp() {
     return qp;
diff --git a/sdk/android/api/org/webrtc/NetworkChangeDetector.java b/sdk/android/api/org/webrtc/NetworkChangeDetector.java
index ed3210e00b..f87ec53ab9 100644
--- a/sdk/android/api/org/webrtc/NetworkChangeDetector.java
+++ b/sdk/android/api/org/webrtc/NetworkChangeDetector.java
@@ -37,6 +37,7 @@ public interface NetworkChangeDetector {
       this.address = address;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("IPAddress")
     private byte[] getAddress() {
       return address;
@@ -61,26 +62,31 @@ public interface NetworkChangeDetector {
       this.ipAddresses = addresses;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("NetworkInformation")
     private IPAddress[] getIpAddresses() {
       return ipAddresses;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("NetworkInformation")
     private ConnectionType getConnectionType() {
       return type;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("NetworkInformation")
     private ConnectionType getUnderlyingConnectionTypeForVpn() {
       return underlyingTypeForVpn;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("NetworkInformation")
     private long getHandle() {
       return handle;
     }
 
+    @SuppressWarnings("UnusedMethod")
     @CalledByNative("NetworkInformation")
     private String getName() {
       return name;
diff --git a/sdk/android/api/org/webrtc/RTCStatsReport.java b/sdk/android/api/org/webrtc/RTCStatsReport.java
index d4d90db1a6..c3ee0d832c 100644
--- a/sdk/android/api/org/webrtc/RTCStatsReport.java
+++ b/sdk/android/api/org/webrtc/RTCStatsReport.java
@@ -54,7 +54,7 @@ public class RTCStatsReport {
   }
 
   // TODO(bugs.webrtc.org/8557) Use ctor directly with full Map type.
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "UnusedMethod"})
   @CalledByNative
   private static RTCStatsReport create(long timestampUs, Map stats) {
     return new RTCStatsReport(timestampUs, stats);
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
index 628b6bd282..5f33d94324 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
@@ -128,18 +128,6 @@ public class NetworkMonitorTest {
     public void setNetworkType(int networkType) {
       this.networkType = networkType;
     }
-
-    public void setNetworkSubtype(int networkSubtype) {
-      this.networkSubtype = networkSubtype;
-    }
-
-    public void setUnderlyingNetworkType(int underlyingNetworkTypeForVpn) {
-      this.underlyingNetworkTypeForVpn = underlyingNetworkTypeForVpn;
-    }
-
-    public void setUnderlyingNetworkSubype(int underlyingNetworkSubtypeForVpn) {
-      this.underlyingNetworkSubtypeForVpn = underlyingNetworkSubtypeForVpn;
-    }
   }
 
   /**
@@ -219,11 +207,6 @@ public class NetworkMonitorTest {
     wifiDelegate.setWifiSSID("foo");
   }
 
-  private NetworkMonitorAutoDetect.ConnectionType getCurrentConnectionType() {
-    final NetworkMonitorAutoDetect.NetworkState networkState = receiver.getCurrentNetworkState();
-    return NetworkMonitorAutoDetect.getConnectionType(networkState);
-  }
-
   @Before
   public void setUp() {
     ContextUtils.initialize(InstrumentationRegistry.getTargetContext());
diff --git a/test/android/org/webrtc/native_test/NativeTestWebrtc.java b/test/android/org/webrtc/native_test/NativeTestWebrtc.java
index 352f9c8b8e..02d7fc63b7 100644
--- a/test/android/org/webrtc/native_test/NativeTestWebrtc.java
+++ b/test/android/org/webrtc/native_test/NativeTestWebrtc.java
@@ -195,6 +195,7 @@ public class NativeTestWebrtc {
     // Signal a failure of the native test loader to python scripts
     // which run tests.  For example, we look for
     // RUNNER_FAILED build/android/test_package.py.
+    @SuppressWarnings("UnusedMethod")
     private void nativeTestFailed() {
         Log.e(TAG, "[ RUNNER_FAILED ] could not load native library");
     }