From f14a71a076a465c7d3ae527288cfc1c0ada5ae4d Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 15 Oct 2019 12:26:24 -0400
Subject: [PATCH] Update Lint suppressions.

---
 lint-baseline.xml                                             | 2 +-
 lint.xml                                                      | 4 ++++
 .../securesms/preferences/CorrectedPreferenceFragment.java    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lint-baseline.xml b/lint-baseline.xml
index 2e4d821e4..003c71931 100644
--- a/lint-baseline.xml
+++ b/lint-baseline.xml
@@ -3,7 +3,7 @@
 
     <issue
         id="LintError"
-        message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)&#xA;&#xA;Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:343)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceSession.argConstraints(InferenceSession.java:1817)←InferenceSession.isFunctionalTypeMoreSpecific(InferenceSession.java:1748)←InferenceSession.isFunctionalTypeMoreSpecificOnExpression(InferenceSession.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:779)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:673)`&#xA;&#xA;You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
+        message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)&#xA;&#xA;Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:342)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceSession.argConstraints(InferenceSession.java:1817)←InferenceSession.isFunctionalTypeMoreSpecific(InferenceSession.java:1748)←InferenceSession.isFunctionalTypeMoreSpecificOnExpression(InferenceSession.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:776)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:670)`&#xA;&#xA;You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
         <location
             file="src/org/thoughtcrime/securesms/jobmanager/JobManager.java"/>
     </issue>
diff --git a/lint.xml b/lint.xml
index 580308e46..9cbbcff9d 100644
--- a/lint.xml
+++ b/lint.xml
@@ -13,4 +13,8 @@
 
     <issue id="CanvasSize" severity="error" />
 
+    <issue id="RestrictedApi" severity="error">
+        <ignore path="src/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
+    </issue>
+
 </lint>
diff --git a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
index 43f93a230..d38d155f6 100644
--- a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
@@ -54,9 +54,9 @@ public abstract class CorrectedPreferenceFragment extends PreferenceFragmentComp
   }
 
   @Override
+  @SuppressLint("RestrictedApi")
   protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
     return new PreferenceGroupAdapter(preferenceScreen) {
-      @SuppressLint("RestrictedApi")
       @Override
       public void onBindViewHolder(PreferenceViewHolder holder, int position) {
         super.onBindViewHolder(holder, position);