From fb6fd4b0056cc07cdf1a5c6753722e822b25917c Mon Sep 17 00:00:00 2001
From: Yves Gerey <yvesg@webrtc.org>
Date: Wed, 14 Nov 2018 09:47:46 +0100
Subject: [PATCH] Fix lint errors for android manifests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is needed to roll android_tools which comes with udpated lint.
See https://chromium-review.googlesource.com/c/chromium/src/+/1331011

Bug: chromium:900912
Change-Id: Ib0a0fb8fdd14269ff84fa99b5c63878f2b3d9fb6
Reviewed-on: https://webrtc-review.googlesource.com/c/110861
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25632}
---
 examples/androidapp/AndroidManifest.xml             | 3 ++-
 examples/androidapp/res/layout/activity_connect.xml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/androidapp/AndroidManifest.xml b/examples/androidapp/AndroidManifest.xml
index d6e0ff0417..576449bb14 100644
--- a/examples/androidapp/AndroidManifest.xml
+++ b/examples/androidapp/AndroidManifest.xml
@@ -18,7 +18,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
+    <uses-permission tools:ignore="ProtectedPermissions"
+                     android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
 
     <!-- This is a test application that should always be debuggable. -->
     <application android:label="@string/app_name"
diff --git a/examples/androidapp/res/layout/activity_connect.xml b/examples/androidapp/res/layout/activity_connect.xml
index 83707f72ed..3c59189644 100644
--- a/examples/androidapp/res/layout/activity_connect.xml
+++ b/examples/androidapp/res/layout/activity_connect.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_margin="16dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -21,7 +22,9 @@
         android:gravity="center"
         android:layout_marginBottom="8dp">
 
+        <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
         <EditText
+            tools:ignore="LabelFor"
             android:id="@+id/room_edittext"
             android:layout_width="0dp"
             android:layout_height="wrap_content"