From bca122e0d593d76a077d6be96201fd5be2a42451 Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Thu, 12 Jan 2017 06:19:40 -0800
Subject: [PATCH] Remove lint ignores and add WrongCall ignore directly to the
 test.

Also removes some unused strings from AppRTCMobile strings.xml.

BUG=webrtc:6597
TBR=kjellander@webrtc.org

Review-Url: https://codereview.webrtc.org/2628833004
Cr-Commit-Position: refs/heads/master@{#16033}
---
 webrtc/build/android/suppressions.xml                          | 2 --
 webrtc/examples/androidapp/res/values/strings.xml              | 3 ---
 .../src/org/webrtc/SurfaceViewRendererOnMeasureTest.java       | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/webrtc/build/android/suppressions.xml b/webrtc/build/android/suppressions.xml
index ead7c4d13e..d48ccb348f 100644
--- a/webrtc/build/android/suppressions.xml
+++ b/webrtc/build/android/suppressions.xml
@@ -14,7 +14,6 @@
 
   <issue id="LongLogTag" severity="ignore"/>
   <issue id="Registered" severity="ignore"/>
-  <issue id="Recycle" severity="ignore"/>
   <issue id="MissingPermission" severity="ignore"/>
   <issue id="CommitPrefEdits" severity="ignore"/>
   <issue id="UnusedResources" severity="ignore"/>
@@ -24,7 +23,6 @@
   <issue id="RelativeOverlap" severity="ignore"/>
   <issue id="RtlCompat" severity="ignore"/>
   <issue id="IconMissingDensityFolder" severity="ignore"/>
-  <issue id="WrongCall" severity="ignore"/>
   <issue id="NewApi" severity="ignore"/>
   <issue id="OldTargetApi" severity="ignore"/>
 
diff --git a/webrtc/examples/androidapp/res/values/strings.xml b/webrtc/examples/androidapp/res/values/strings.xml
index e8bbbd540d..c6935a4622 100644
--- a/webrtc/examples/androidapp/res/values/strings.xml
+++ b/webrtc/examples/androidapp/res/values/strings.xml
@@ -162,12 +162,10 @@
 
     <string name="pref_enable_datachannel_key">enable_datachannel_preference</string>
     <string name="pref_enable_datachannel_title">Enable datachannel.</string>
-    <string name="pref_enable_datachannel_dlg">Enable datachannel.</string>
     <string name="pref_enable_datachannel_default" translatable="false">true</string>
 
     <string name="pref_ordered_key">ordered_preference</string>
     <string name="pref_ordered_title">Order messages.</string>
-    <string name="pref_ordered_dlg">Order messages.</string>
     <string name="pref_ordered_default" translatable="false">true</string>
 
     <string name="pref_data_protocol_key">Subprotocol</string>
@@ -177,7 +175,6 @@
 
     <string name="pref_negotiated_key">negotiated_preference</string>
     <string name="pref_negotiated_title">Negotiated.</string>
-    <string name="pref_negotiated_dlg">Negotiated.</string>
     <string name="pref_negotiated_default" translatable="false">false</string>
 
     <string name="pref_max_retransmit_time_ms_key">max_retransmit_time_ms_preference</string>
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
index 5cf48e6789..eba555b476 100644
--- a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
+++ b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
@@ -13,6 +13,7 @@ package org.webrtc;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import android.annotation.SuppressLint;
 import android.graphics.Point;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.annotation.UiThreadTest;
@@ -60,6 +61,7 @@ public class SurfaceViewRendererOnMeasureTest {
   /**
    * Assert onMeasure() with given parameters will result in expected measured size.
    */
+  @SuppressLint("WrongCall")
   private static void assertMeasuredSize(SurfaceViewRenderer surfaceViewRenderer,
       RendererCommon.ScalingType scalingType, String frameDimensions, int expectedWidth,
       int expectedHeight, int widthSpec, int heightSpec) {