Baseline NewApi issues am: a3bbde19a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/21911741

Change-Id: I2074cc62613dd3c24e0b4254dd612ebb1940f8cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 27 insertions, 306 deletions

diff --git a/lint-baseline.xml b/lint-baseline.xml
index d91a1894..29aff212 100644
--- a/lint-baseline.xml
+++ b/lint-baseline.xml
@@ -25,28 +25,6 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `updateAndStartServiceIfNeeded`"
-        errorLine1="            scheduler.updateAndStartServiceIfNeeded();"
-        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/receiver/BootCompletedReceiver.java"
-            line="90"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="        if (!TvContract.isChannelUriForPassthroughInput(uri)) {"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/data/ChannelImpl.java"
-            line="444"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#canRecord`"
         errorLine1="                if (info.canRecord()) {"
         errorLine2="                         ~~~~~~~~~">
@@ -80,17 +58,6 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="        CharSequence customLabel = input.loadCustomLabel(getContext());"
-        errorLine2="                                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/ui/InputBannerView.java"
-            line="75"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#canRecord`"
         errorLine1="            tunerCount = mInput.canRecord() ? mInput.getTunerCount() : 0;"
         errorLine2="                                ~~~~~~~~~">
@@ -113,193 +80,6 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="                TvContract.isChannelUriForPassthroughInput(getIntent().getData());"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="534"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="            if (TvContract.isChannelUriForPassthroughInput(mInitChannelUri)) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="1002"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="        if ((channelUri == null || !TvContract.isChannelUriForPassthroughInput(channelUri))"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="1029"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="                TvContract.isChannelUriForPassthroughInput(channelUri)"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="1037"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="            if (TvContract.isChannelUriForPassthroughInput(channelUri)) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="1065"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="            } else if (TvContract.isChannelUriForPassthroughInput(mInitChannelUri)) {"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="1544"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Method reference requires API level 24 (current min is 23): `MainActivity.super::enterPictureInPictureMode`"
-        errorLine1="            mHandler.post(MainActivity.super::enterPictureInPictureMode);"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="2402"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="        return TvContract.isChannelUriForPassthroughInput(uri)"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
-            line="2813"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 23): `android.media.tv.TvInputManager#getBlockedRatings`"
-        errorLine1="            for (TvContentRating tvContentRating : mTvInputManager.getBlockedRatings()) {"
-        errorLine2="                                                                   ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/parental/ParentalControlSettings.java"
-            line="74"
-            column="68"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 23): `android.media.tv.TvInputManager#getBlockedRatings`"
-        errorLine1="        mRatings = new HashSet&lt;>(mTvInputManager.getBlockedRatings());"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/parental/ParentalControlSettings.java"
-            line="89"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 23): `android.media.tv.TvInputManager#getBlockedRatings`"
-        errorLine1="        Set&lt;TvContentRating> removed = new HashSet&lt;>(mTvInputManager.getBlockedRatings());"
-        errorLine2="                                                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/parental/ParentalControlSettings.java"
-            line="93"
-            column="70"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 28 (current min is 23): `android.media.tv.TvInputManager#getBlockedRatings`"
-        errorLine1="        added.removeAll(mTvInputManager.getBlockedRatings());"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/parental/ParentalControlSettings.java"
-            line="100"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="            if (TvContract.isChannelUriForPassthroughInput(channelUri)) {"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/SelectInputActivity.java"
-            line="69"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#isHidden`"
-        errorLine1="                if (!input.isHidden(getContext())) {"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/ui/SelectInputView.java"
-            line="253"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="        CharSequence customLabel = input.loadCustomLabel(getContext());"
-        errorLine2="                                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/ui/SelectInputView.java"
-            line="287"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvView#tune`"
-        errorLine1="            mTvView.tune(mInputInfo.getId(), mCurrentChannel.getUri(), params);"
-        errorLine2="                    ~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/ui/TunableTvView.java"
-            line="671"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#getTunerCount`"
-        errorLine1="                                input.getTunerCount(),"
-        errorLine2="                                      ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/ui/TunableTvView.java"
-            line="1174"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 24 (current min is 23): `createScheduler`"
         errorLine1="                mRecordingScheduler = RecordingScheduler.createScheduler(this);"
         errorLine2="                                                         ~~~~~~~~~~~~~~~">
@@ -311,61 +91,6 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#isHidden`"
-        errorLine1="                if (!input.isHidden(this)) {"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/TvApplication.java"
-            line="402"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="                        CharSequence inputCustomLabel = info.loadCustomLabel(mContext);"
-        errorLine2="                                                             ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/util/TvInputManagerHelper.java"
-            line="216"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="                    CharSequence inputCustomLabel = info.loadCustomLabel(mContext);"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/util/TvInputManagerHelper.java"
-            line="257"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputManager.TvInputCallback#onInputUpdated`"
-        errorLine1="                        callback.onInputUpdated(inputId);"
-        errorLine2="                                 ~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/util/TvInputManagerHelper.java"
-            line="265"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="                    CharSequence inputCustomLabel = inputInfo.loadCustomLabel(mContext);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/util/TvInputManagerHelper.java"
-            line="279"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="NewApi"
         message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputManager.TvInputCallback#onTvInputInfoUpdated`"
         errorLine1="                        callback.onTvInputInfoUpdated(inputInfo);"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~">
@@ -377,46 +102,26 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="            CharSequence customLabelCharSequence = info.loadCustomLabel(mContext);"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/TV/src/com/android/tv/util/TvInputManagerHelper.java"
-            line="472"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="            String customLabel = canonicalizeLabel(input.loadCustomLabel(mContext));"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#getTunerCount`">
         <location
-            file="packages/apps/TV/src/com/android/tv/search/TvProviderSearch.java"
-            line="510"
-            column="58"/>
+            file="packages/apps/TV/src/com/android/tv/ui/TunableTvView.java"
+            line="1205"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputInfo#loadCustomLabel`"
-        errorLine1="            String customLabel = canonicalizeLabel(input.loadCustomLabel(mContext));"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `updateAndStartServiceIfNeeded`">
         <location
-            file="packages/apps/TV/src/com/android/tv/search/TvProviderSearch.java"
-            line="535"
-            column="58"/>
+            file="packages/apps/TV/src/com/android/tv/receiver/BootCompletedReceiver.java"
+            line="95"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvContract#isChannelUriForPassthroughInput`"
-        errorLine1="        return isChannelUriForTunerInput(uri) || TvContract.isChannelUriForPassthroughInput(uri);"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Method reference requires API level 24 (current min is 23): `MainActivity.super::enterPictureInPictureMode`">
         <location
-            file="packages/apps/TV/src/com/android/tv/util/Utils.java"
-            line="276"
-            column="61"/>
+            file="packages/apps/TV/src/com/android/tv/MainActivity.java"
+            line="2435"/>
     </issue>
 
-</issues>
+</issues>
\ No newline at end of file
diff --git a/tuner/lint-baseline.xml b/tuner/lint-baseline.xml
index a0db5e0b..f359c6b3 100644
--- a/tuner/lint-baseline.xml
+++ b/tuner/lint-baseline.xml
@@ -169,4 +169,20 @@
             line="101"/>
     </issue>
 
-</issues>
+    <issue
+        id="NewApi"
+        message="Call requires API level 26 (current min is 23): `new android.app.Notification.TvExtender`">
+        <location
+            file="packages/apps/TV/tuner/src/com/android/tv/tuner/setup/BaseTunerSetupActivity.java"
+            line="416"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Cast from `TvExtender` to `Extender` requires API level 26 (current min is 23)">
+        <location
+            file="packages/apps/TV/tuner/src/com/android/tv/tuner/setup/BaseTunerSetupActivity.java"
+            line="416"/>
+    </issue>
+
+</issues>
\ No newline at end of file