diff --git a/tuner/lint-baseline.xml b/tuner/lint-baseline.xml
index 21efcac..a0db5e0 100644
--- a/tuner/lint-baseline.xml
+++ b/tuner/lint-baseline.xml
@@ -1,213 +1,172 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+<issues format="5" by="lint 7.2.0-dev" client="cli" variant="all" version="4.1.0">
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 23): `android.app.NotificationManager#createNotificationChannel`"
-        errorLine1="        notificationManager.createNotificationChannel("
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 26 (current min is 23): `android.app.NotificationManager#createNotificationChannel`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/setup/BaseTunerSetupActivity.java"
-            line="399"
-            column="29"/>
+            line="399"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 23): `new android.app.NotificationChannel`"
-        errorLine1="                new NotificationChannel("
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 26 (current min is 23): `new android.app.NotificationChannel`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/setup/BaseTunerSetupActivity.java"
-            line="400"
-            column="17"/>
+            line="400"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 26 (current min is 23): `new android.app.Notification.Builder`"
-        errorLine1="                new Notification.Builder(context, TUNER_SET_UP_NOTIFICATION_CHANNEL_ID)"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 26 (current min is 23): `new android.app.Notification.Builder`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/setup/BaseTunerSetupActivity.java"
-            line="406"
-            column="17"/>
+            line="406"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.app.job.JobScheduler#getPendingJob`"
-        errorLine1="            JobInfo pendingJob = jobScheduler.getPendingJob(DVR_STORAGE_CLEANUP_JOB_ID);"
-        errorLine2="                                              ~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.app.job.JobScheduler#getPendingJob`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/BaseTunerTvInputService.java"
-            line="94"
-            column="47"/>
+            line="94"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `RecordingSessionCompat`"
-        errorLine1="        super(context);"
-        errorLine2="        ~~~~~">
+        message="Extending RecordingSessionCompat requires API level 24 (current min is 23): `RecordingSessionCompat`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
-            line="54"
-            column="9"/>
+            line="39"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyTuned`"
-        errorLine1="        notifyTuned(channelUri);"
-        errorLine2="        ~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `RecordingSessionCompat`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
-            line="107"
-            column="9"/>
+            line="54"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `notifyRecordingStarted`"
-        errorLine1="        notifyRecordingStarted(recUri);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyTuned`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
-            line="116"
-            column="9"/>
+            line="107"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyRecordingStopped`"
-        errorLine1="        notifyRecordingStopped(recordedProgramUri);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `notifyRecordingStarted`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
-            line="125"
-            column="9"/>
+            line="116"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyError`"
-        errorLine1="        notifyError(reason);"
-        errorLine2="        ~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyRecordingStopped`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
-            line="131"
-            column="9"/>
+            line="125"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `RecordingSessionCompat`"
-        errorLine1="        super(context);"
-        errorLine2="        ~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyError`">
+        <location
+            file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSession.java"
+            line="131"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Extending RecordingSessionCompat requires API level 24 (current min is 23): `RecordingSessionCompat`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
-            line="54"
-            column="9"/>
+            line="39"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyTuned`"
-        errorLine1="        notifyTuned(channelUri);"
-        errorLine2="        ~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `RecordingSessionCompat`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
-            line="107"
-            column="9"/>
+            line="54"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `notifyRecordingStarted`"
-        errorLine1="        notifyRecordingStarted(recUri);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyTuned`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
-            line="116"
-            column="9"/>
+            line="107"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyRecordingStopped`"
-        errorLine1="        notifyRecordingStopped(recordedProgramUri);"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `notifyRecordingStarted`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
-            line="125"
-            column="9"/>
+            line="116"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyError`"
-        errorLine1="        notifyError(reason);"
-        errorLine2="        ~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyRecordingStopped`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
-            line="131"
-            column="9"/>
+            line="125"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`"
-        errorLine1="                .insert(TvContract.RecordedPrograms.CONTENT_URI, values);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 24 (current min is 23): `android.media.tv.TvInputService.RecordingSession#notifyError`">
+        <location
+            file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionExoV2.java"
+            line="131"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionWorker.java"
-            line="616"
-            column="25"/>
+            line="616"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`"
-        errorLine1="        Uri uri = TvContract.RecordedPrograms.CONTENT_URI;"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionWorker.java"
-            line="689"
-            column="19"/>
+            line="689"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`"
-        errorLine1="                .insert(TvContract.RecordedPrograms.CONTENT_URI, values);"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionWorkerExoV2.java"
-            line="619"
-            column="25"/>
+            line="619"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`"
-        errorLine1="        Uri uri = TvContract.RecordedPrograms.CONTENT_URI;"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerRecordingSessionWorkerExoV2.java"
-            line="692"
-            column="19"/>
+            line="692"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`"
-        errorLine1="                            TvContract.RecordedPrograms.CONTENT_URI,"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Field requires API level 24 (current min is 23): `android.media.tv.TvContract.RecordedPrograms#CONTENT_URI`">
         <location
             file="packages/apps/TV/tuner/src/com/android/tv/tuner/tvinput/TunerStorageCleanUpService.java"
-            line="101"
-            column="29"/>
+            line="101"/>
     </issue>
 
 </issues>