Merge "Baseline NewApi issues" into main

7 files changed, 492 insertions, 271 deletions

diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index fae33d646..54596049e 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -52,9 +52,6 @@ java_library {
     srcs: [
         ":statslog-permissioncontroller-java-gen",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 java_library {
@@ -72,9 +69,6 @@ java_library {
         "//apex_available:platform",
         "com.android.permission",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 android_library {
@@ -165,6 +159,7 @@ android_library {
         strict_updatability_linting: true,
         error_checks: ["Recycle"],
         baseline_filename: "lint-baseline.xml",
+
     },
 
     apex_available: [
@@ -195,7 +190,7 @@ android_app {
     lint: {
         strict_updatability_linting: true,
         error_checks: ["Recycle"],
-        baseline_filename: "lint-baseline.xml",
+
     },
 
     optimize: {
diff --git a/PermissionController/lint-baseline.xml b/PermissionController/lint-baseline.xml
index 546ed596d..5d77d8c81 100644
--- a/PermissionController/lint-baseline.xml
+++ b/PermissionController/lint-baseline.xml
@@ -1,92 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.apphibernation.AppHibernationManager#isHibernatingForUser`"
-        errorLine1="                    if (hibernationManager.isHibernatingForUser(pkg.packageName)) {"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        message="Class requires API level 34 (current min is 31): `android.app.AppOpsManager.OnOpNotedListener`"
+        errorLine1="    AppOpsManager.OnOpNotedListener,"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt"
-            line="56"
-            column="44"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt"
+            line="46"
+            column="5"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.content.pm.Attribution#getLabel`"
-        errorLine1="            attributions?.forEach { attributionTagToLabel[it.tag] = it.label }"
-        errorLine2="                                                                       ~~~~~">
+        message="Class requires API level 34 (current min is 31): `android.app.AppOpsManager.OnOpNotedListener`"
+        errorLine1="    AppOpsManager.OnOpNotedListener,"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt"
-            line="125"
-            column="72"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightPackageOpsLiveData.kt"
+            line="43"
+            column="5"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.content.pm.Attribution#getTag`"
-        errorLine1="            attributions?.forEach { attributionTagToLabel[it.tag] = it.label }"
-        errorLine2="                                                             ~~~">
+        message="Call requires API level 33 (current min is 30): `getIconId`"
+        errorLine1="                .setIcon(args.getIconId())"
+        errorLine2="                              ~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt"
-            line="125"
-            column="62"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="504"
+            column="31"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#canAdminGrantSensorsPermissions`"
-        errorLine1="                params.getGrantState(), params.canAdminGrantSensorsPermissions())));"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getMessageId`"
+        errorLine1="                .setMessage(args.getMessageId())"
+        errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
-            line="517"
-            column="48"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="505"
+            column="34"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getGrantState`"
-        errorLine1="                params.getGrantState(), params.canAdminGrantSensorsPermissions())));"
-        errorLine2="                       ~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getNegativeButtonTextId`"
+        errorLine1="                .setNegativeButton(args.getNegativeButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
-            line="517"
-            column="24"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="509"
+            column="41"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getGranteePackageName`"
-        errorLine1="                callerPackageName, params.getGranteePackageName(), params.getPermission(),"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getPositiveButtonTextId`"
+        errorLine1="                .setPositiveButton(args.getPositiveButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
-            line="516"
-            column="43"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="513"
+            column="41"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getPermission`"
-        errorLine1="                callerPackageName, params.getGranteePackageName(), params.getPermission(),"
-        errorLine2="                                                                          ~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getSetOneTime`"
+        errorLine1="                            mViewModel.requestChange(args.getSetOneTime(),"
+        errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
-            line="516"
-            column="75"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="515"
+            column="59"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.hardware.SensorPrivacyManager#addSensorPrivacyListener`"
-        errorLine1="            mSensorPrivacyManager.addSensorPrivacyListener(mPrivacyChangedListener);"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getChangeRequest`"
+        errorLine1="                                    args.getChangeRequest(),"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java"
-            line="159"
-            column="35"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="518"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getButtonClicked`"
+        errorLine1="                                    args.getButtonClicked());"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="519"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="        if (args.getTitleId() != 0) {"
+        errorLine2="                 ~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="521"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="            b.setTitle(args.getTitleId());"
+        errorLine2="                            ~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java"
+            line="522"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getIconId`"
+        errorLine1="                .setIcon(args.getIconId())"
+        errorLine2="                              ~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="709"
+            column="31"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getMessageId`"
+        errorLine1="                .setMessage(args.getMessageId())"
+        errorLine2="                                 ~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="710"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getNegativeButtonTextId`"
+        errorLine1="                .setNegativeButton(args.getNegativeButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="714"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getPositiveButtonTextId`"
+        errorLine1="                .setPositiveButton(args.getPositiveButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="718"
+            column="41"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getSetOneTime`"
+        errorLine1="                            mViewModel.requestChange(args.getSetOneTime(),"
+        errorLine2="                                                          ~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="720"
+            column="59"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getButtonClicked`"
+        errorLine1="                                    args.getChangeRequest(), args.getButtonClicked());"
+        errorLine2="                                                                  ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="722"
+            column="67"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getChangeRequest`"
+        errorLine1="                                    args.getChangeRequest(), args.getButtonClicked());"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="722"
+            column="42"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="        if (args.getTitleId() != 0) {"
+        errorLine2="                 ~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="724"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="            b.setTitle(args.getTitleId());"
+        errorLine2="                            ~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java"
+            line="725"
+            column="29"/>
     </issue>
 
     <issue
@@ -95,8 +227,8 @@
         errorLine1="            mSensorPrivacyManager.addSensorPrivacyListener(mPrivacyChangedListener);"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java"
-            line="114"
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java"
+            line="159"
             column="35"/>
     </issue>
 
@@ -113,101 +245,134 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.hardware.SensorPrivacyManager#removeSensorPrivacyListener`"
-        errorLine1="            mSensorPrivacyManager.removeSensorPrivacyListener(mPrivacyChangedListener);"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getIconId`"
+        errorLine1="                .setIcon(args.getIconId())"
+        errorLine2="                              ~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java"
-            line="365"
-            column="35"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="463"
+            column="31"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterData#getIssues`"
-        errorLine1="    issues"
-        errorLine2="    ~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getMessageId`"
+        errorLine1="                .setMessage(args.getMessageId())"
+        errorLine2="                                 ~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="309"
-            column="5"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="464"
+            column="34"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterData#getIssues`"
-        errorLine1="private fun SafetyCenterData.buildIssueIdSet(): Set&lt;IssueId&gt; = issues.map { it.id }.toSet()"
-        errorLine2="                                                               ~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getNegativeButtonTextId`"
+        errorLine1="                .setNegativeButton(args.getNegativeButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="323"
-            column="64"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="468"
+            column="41"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterData#getStatus`"
-        errorLine1="    status.refreshStatus == SafetyCenterStatus.REFRESH_STATUS_FULL_RESCAN_IN_PROGRESS"
-        errorLine2="    ~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getPositiveButtonTextId`"
+        errorLine1="                .setPositiveButton(args.getPositiveButtonTextId(),"
+        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="321"
-            column="5"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="472"
+            column="41"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getActions`"
-        errorLine1="            issue.actions"
-        errorLine2="                  ~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getSetOneTime`"
+        errorLine1="                            mViewModel.requestChange(args.getSetOneTime(),"
+        errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="311"
-            column="19"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="474"
+            column="59"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getId`"
-        errorLine1="                .map { issue.id to it.id }"
-        errorLine2="                             ~~">
+        message="Call requires API level 33 (current min is 30): `getButtonClicked`"
+        errorLine1="                                    args.getChangeRequest(), args.getButtonClicked());"
+        errorLine2="                                                                  ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="315"
-            column="30"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="476"
+            column="67"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getId`"
-        errorLine1="private fun SafetyCenterData.buildIssueIdSet(): Set&lt;IssueId&gt; = issues.map { it.id }.toSet()"
-        errorLine2="                                                                               ~~">
+        message="Call requires API level 33 (current min is 30): `getChangeRequest`"
+        errorLine1="                                    args.getChangeRequest(), args.getButtonClicked());"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="323"
-            column="80"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="476"
+            column="42"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#getId`"
-        errorLine1="                .map { issue.id to it.id }"
-        errorLine2="                                      ~~">
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="        if (args.getTitleId() != 0) {"
+        errorLine2="                 ~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="315"
-            column="39"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="478"
+            column="18"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#getSuccessMessage`"
-        errorLine1="                .filter { it.isInFlight &amp;&amp; !it.successMessage.isNullOrEmpty() }"
-        errorLine2="                                               ~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `getTitleId`"
+        errorLine1="            b.setTitle(args.getTitleId());"
+        errorLine2="                            ~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="314"
-            column="48"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java"
+            line="479"
+            column="29"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 34 (current min is 30): `android.health.connect.HealthConnectManager#isHealthPermission`"
+        errorLine1="                    .filter { permission -&gt; isHealthPermission(activity, permission) }"
+        errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt"
+            line="1059"
+            column="45"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 31 (current min is 30): `android.apphibernation.AppHibernationManager`"
+        errorLine1="                userContext.getSystemService(APP_HIBERNATION_SERVICE) as AppHibernationManager"
+        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt"
+            line="48"
+            column="74"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 31 (current min is 30): `android.apphibernation.AppHibernationManager#isHibernatingForUser`"
+        errorLine1="                    if (hibernationManager.isHibernatingForUser(pkg.packageName)) {"
+        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt"
+            line="51"
+            column="44"/>
     </issue>
 
     <issue
@@ -223,156 +388,167 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#isInFlight`"
-        errorLine1="                .filter { it.isInFlight &amp;&amp; !it.successMessage.isNullOrEmpty() }"
-        errorLine2="                             ~~~~~~~~~~">
+        message="Call requires API level 31 (current min is 30): `android.os.UserManager#isCloneProfile`"
+        errorLine1="            if (userManager.isCloneProfile) {"
+        errorLine2="                            ~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="314"
-            column="30"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt"
+            line="653"
+            column="29"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#isSafetyCenterEnabled`"
-        errorLine1="        if (!safetyCenterManager.isSafetyCenterEnabled()) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.app.Activity#startActivityForResultAsUser`"
+        errorLine1="        activity.startActivityForResultAsUser(pickerIntent, requestCode, user)"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
-            line="96"
-            column="34"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt"
+            line="662"
+            column="18"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#isSafetyCenterEnabled`"
-        errorLine1="        if (!safetyCenterManager.isSafetyCenterEnabled()) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 34 (current min is 30): `android.health.connect.HealthConnectManager#getHealthPermissions`"
+        errorLine1="        val permissions = HealthConnectManager.getHealthPermissions(context)"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
-            line="149"
-            column="34"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt"
+            line="1689"
+            column="48"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#isSafetyCenterEnabled`"
-        errorLine1="        if (!scManager.isSafetyCenterEnabled) {"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 31 (current min is 30): `android.content.pm.Attribution#getLabel`"
+        errorLine1="            attributions?.forEach { attributionTagToLabel[it.tag] = it.label }"
+        errorLine2="                                                                       ~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt"
-            line="48"
-            column="24"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt"
+            line="140"
+            column="72"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#refreshSafetySources`"
-        errorLine1="        safetyCenterManager.refreshSafetySources(getRefreshReason());"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 31 (current min is 30): `android.content.pm.Attribution#getTag`"
+        errorLine1="            attributions?.forEach { attributionTagToLabel[it.tag] = it.label }"
+        errorLine2="                                                             ~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
-            line="155"
-            column="29"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt"
+            line="140"
+            column="62"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterStatus#getRefreshStatus`"
-        errorLine1="    status.refreshStatus == SafetyCenterStatus.REFRESH_STATUS_FULL_RESCAN_IN_PROGRESS"
-        errorLine2="           ~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getActions`"
+        errorLine1="            issue.actions"
+        errorLine2="                  ~~~~~~~">
         <location
             file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
-            line="321"
-            column="12"/>
+            line="288"
+            column="19"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `recordPermissionDecision`"
-        errorLine1="        PermissionDecisionStorageImpl.recordPermissionDecision(app.applicationContext,"
-        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#getSuccessMessage`"
+        errorLine1="                .filter { it.isInFlight &amp;&amp; !it.successMessage.isNullOrEmpty() }"
+        errorLine2="                                               ~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt"
-            line="1147"
-            column="39"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="291"
+            column="48"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `android.content.pm.PackageManager#getAppMetadata`"
-        errorLine1="            app.packageManager.getAppMetadata(packageName)"
-        errorLine2="                               ~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#isInFlight`"
+        errorLine1="                .filter { it.isInFlight &amp;&amp; !it.successMessage.isNullOrEmpty() }"
+        errorLine2="                             ~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/SafetyLabelInfoLiveData.kt"
-            line="116"
-            column="32"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="291"
+            column="30"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `android.health.connect.HealthConnectManager#getHealthPermissions`"
-        errorLine1="        val permissions = HealthConnectManager.getHealthPermissions(context)"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getId`"
+        errorLine1="                .map { issue.id to it.id }"
+        errorLine2="                             ~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt"
-            line="1465"
-            column="48"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="292"
+            column="30"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 30): `android.health.connect.HealthConnectManager#isHealthPermission`"
-        errorLine1="                isHealthPermission(activity, permission)"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue.Action#getId`"
+        errorLine1="                .map { issue.id to it.id }"
+        errorLine2="                                      ~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt"
-            line="1268"
-            column="17"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="292"
+            column="39"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 31 (current min is 30): `android.apphibernation.AppHibernationManager`"
-        errorLine1="                userContext.getSystemService(APP_HIBERNATION_SERVICE) as AppHibernationManager"
-        errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterData#getStatus`"
+        errorLine1="    status.refreshStatus == SafetyCenterStatus.REFRESH_STATUS_FULL_RESCAN_IN_PROGRESS"
+        errorLine2="    ~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt"
-            line="53"
-            column="74"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="298"
+            column="5"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager`"
-        errorLine1="                context.getSystemService(SafetyCenterManager.class);"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterStatus#getRefreshStatus`"
+        errorLine1="    status.refreshStatus == SafetyCenterStatus.REFRESH_STATUS_FULL_RESCAN_IN_PROGRESS"
+        errorLine2="           ~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
-            line="84"
-            column="42"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="298"
+            column="12"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager`"
-        errorLine1="        SafetyCenterManager safetyCenterManager = this.getSystemService(SafetyCenterManager.class);"
-        errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterIssue#getId`"
+        errorLine1="    allResolvableIssues.map { it.id }.toSet()"
+        errorLine2="                                 ~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
-            line="144"
-            column="73"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="301"
+            column="34"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager`"
-        errorLine1="        val scManager = getSystemService(SafetyCenterManager::class.java)!!"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterData#getIssues`"
+        errorLine1="            issues.asSequence()"
+        errorLine2="            ~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/v33/SafetyCenterQsTileService.kt"
-            line="41"
-            column="42"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt"
+            line="308"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Field requires API level 33 (current min is 30): `Companion`"
+        errorLine1="                    MoreIssuesCardPreference.TAG,"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/MoreIssuesCardAnimator.kt"
+            line="110"
+            column="21"/>
     </issue>
 
     <issue
@@ -382,88 +558,140 @@
         errorLine2="                                             ~~~">
         <location
             file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/MoreIssuesCardAnimator.kt"
-            line="107"
+            line="110"
             column="46"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.app.AppOpsManager.HistoricalOp#getDiscreteAccessAt`">
+        message="Call requires API level 33 (current min is 30): `android.hardware.SensorPrivacyManager#addSensorPrivacyListener`"
+        errorLine1="            mSensorPrivacyManager.addSensorPrivacyListener(mPrivacyChangedListener);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt"
-            line="153"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java"
+            line="114"
+            column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.app.AppOpsManager.HistoricalOp#getDiscreteAccessAt`">
+        message="Call requires API level 33 (current min is 30): `android.hardware.SensorPrivacyManager#removeSensorPrivacyListener`"
+        errorLine1="            mSensorPrivacyManager.removeSensorPrivacyListener(mPrivacyChangedListener);"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt"
-            line="188"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java"
+            line="365"
+            column="35"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.app.AppOpsManager.HistoricalOp#getDiscreteAccessCount`">
+        message="Call requires API level 31 (current min is 30): `SensorStatusLiveData`"
+        errorLine1="        lazy(LazyThreadSafetyMode.NONE) { SensorStatusLiveData() }"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt"
-            line="152"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionAppsViewModel.kt"
+            line="100"
+            column="43"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.app.AppOpsManager.HistoricalOp#getDiscreteAccessCount`">
+        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getGranteePackageName`"
+        errorLine1="                callerPackageName, params.getGranteePackageName(), params.getPermission(),"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt"
-            line="187"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
+            line="521"
+            column="43"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.app.AppOpsManager.HistoricalOpsRequest.Builder#setHistoryFlags`">
+        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getPermission`"
+        errorLine1="                callerPackageName, params.getGranteePackageName(), params.getPermission(),"
+        errorLine2="                                                                          ~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt"
-            line="104"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
+            line="521"
+            column="75"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `getParentGroupId`">
+        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#canAdminGrantSensorsPermissions`"
+        errorLine1="                params.getGrantState(), params.canAdminGrantSensorsPermissions())));"
+        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java"
-            line="91"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
+            line="522"
+            column="48"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `openRelevantSubpage`">
+        message="Call requires API level 31 (current min is 30): `android.permission.AdminPermissionControlParams#getGrantState`"
+        errorLine1="                params.getGrantState(), params.canAdminGrantSensorsPermissions())));"
+        errorLine2="                       ~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java"
-            line="88"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java"
+            line="522"
+            column="24"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `openRelevantSubpage`">
+        message="Class requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager`"
+        errorLine1="                context.getSystemService(SafetyCenterManager.class);"
+        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java"
-            line="92"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
+            line="85"
+            column="42"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 34 (current min is 30): `android.app.AppOpsManager.OnOpNotedListener`">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#isSafetyCenterEnabled`"
+        errorLine1="        if (!safetyCenterManager.isSafetyCenterEnabled()) {"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt"
-            line="46"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
+            line="97"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Class requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager`"
+        errorLine1="        SafetyCenterManager safetyCenterManager = this.getSystemService(SafetyCenterManager.class);"
+        errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
+            line="141"
+            column="73"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Class requires API level 34 (current min is 30): `android.app.AppOpsManager.OnOpNotedListener`">
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#isSafetyCenterEnabled`"
+        errorLine1="        if (!safetyCenterManager.isSafetyCenterEnabled()) {"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightPackageOpsLiveData.kt"
-            line="43"/>
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
+            line="146"
+            column="34"/>
+    </issue>
+
+    <issue
+        id="NewApi"
+        message="Call requires API level 33 (current min is 30): `android.safetycenter.SafetyCenterManager#refreshSafetySources`"
+        errorLine1="        safetyCenterManager.refreshSafetySources(getRefreshReason());"
+        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java"
+            line="152"
+            column="29"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/PermissionController/role-controller/lint-baseline.xml b/PermissionController/role-controller/lint-baseline.xml
index e7c119f3b..894dc1834 100644
--- a/PermissionController/role-controller/lint-baseline.xml
+++ b/PermissionController/role-controller/lint-baseline.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
         message="Call requires API level 31 (current min is 30): `android.app.NotificationManager#setNotificationListenerAccessGranted`"
-        errorLine1="            notificationManager.setNotificationListenerAccessGranted("
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine1="            userNotificationManager.setNotificationListenerAccessGranted("
+        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="packages/modules/Permission/PermissionController/role-controller/java/com/android/role/controller/util/NotificationUtils.java"
-            line="74"
-            column="33"/>
+            line="78"
+            column="37"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/framework-s/Android.bp b/framework-s/Android.bp
index 8d4d04ae1..7c958f923 100644
--- a/framework-s/Android.bp
+++ b/framework-s/Android.bp
@@ -94,7 +94,7 @@ java_sdk_library {
     jarjar_rules: "jarjar-rules.txt",
     lint: {
         strict_updatability_linting: true,
-        baseline_filename: "lint-baseline.xml",
+
     },
     min_sdk_version: "31",
     permitted_packages: [
diff --git a/framework-s/lint-baseline.xml b/framework-s/lint-baseline.xml
index b91b959e4..eb4ed1796 100644
--- a/framework-s/lint-baseline.xml
+++ b/framework-s/lint-baseline.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.content.Context#getUser`"
-        errorLine1="                    .append(String.valueOf(mContext.getUser().getIdentifier())).println();"
-        errorLine2="                                                    ~~~~~~~">
+        message="Call requires API level 33 (current min is 30): `android.util.Slog#e`"
+        errorLine1='                    Slog.e(LOG_TAG, "Failed to unbind: " + e);'
+        errorLine2="                         ~">
         <location
             file="frameworks/base/core/java/com/android/internal/infra/ServiceConnector.java"
-            line="707"
-            column="53"/>
+            line="576"
+            column="26"/>
     </issue>
 
     <issue
@@ -25,13 +25,13 @@
 
     <issue
         id="NewApi"
-        message="Call requires API level 33 (current min is 30): `android.util.Slog#e`"
-        errorLine1='                    Slog.e(LOG_TAG, "Failed to unbind: " + e);'
-        errorLine2="                         ~">
+        message="Call requires API level 31 (current min is 30): `android.content.Context#getUser`"
+        errorLine1="                    .append(String.valueOf(mContext.getUser().getIdentifier())).println();"
+        errorLine2="                                                    ~~~~~~~">
         <location
             file="frameworks/base/core/java/com/android/internal/infra/ServiceConnector.java"
-            line="576"
-            column="26"/>
+            line="707"
+            column="53"/>
     </issue>
 
 </issues>
\ No newline at end of file
diff --git a/service/Android.bp b/service/Android.bp
index c6a00748d..8cd3a452d 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -44,9 +44,6 @@ java_library {
         "com.android.permission",
         "test_com.android.permission",
     ],
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 java_library {
@@ -65,9 +62,6 @@ java_library {
     installable: false,
     min_sdk_version: "30",
     sdk_version: "system_server_current",
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
 
 java_sdk_library {
@@ -132,6 +126,7 @@ java_sdk_library {
     lint: {
         strict_updatability_linting: true,
         baseline_filename: "lint-baseline.xml",
+
     },
     min_sdk_version: "30",
     sdk_version: "system_server_current",
@@ -174,7 +169,4 @@ java_library {
     ],
     min_sdk_version: "30",
     sdk_version: "system_server_current",
-    lint: {
-        baseline_filename: "lint-baseline.xml",
-    },
 }
diff --git a/service/lint-baseline.xml b/service/lint-baseline.xml
index dd7e79ef5..226175e91 100644
--- a/service/lint-baseline.xml
+++ b/service/lint-baseline.xml
@@ -1,42 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
+<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
 
     <issue
         id="NewApi"
-        message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
-        errorLine1="        return UserHandle.of(userId).getUid(appId);"
-        errorLine2="                                     ~~~~~~">
+        message="Call requires API level 34 (current min is 33): `getDeduplicationGroup`"
+        errorLine1="        String deduplicationGroup = issueInfo.getSafetySource().getDeduplicationGroup();"
+        errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/service/java/com/android/permission/compat/UserHandleCompat.java"
-            line="57"
-            column="38"/>
+            file="packages/modules/Permission/service/java/com/android/safetycenter/data/SafetyCenterIssueDeduplicator.java"
+            line="316"
+            column="65"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `android.content.pm.PackageManager#getPackageUidAsUser`"
-        errorLine1="                        packageManager.getPackageUidAsUser("
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
+        message="Call requires API level 34 (current min is 33): `getDeduplicationId`"
+        errorLine1="        String deduplicationId = issueInfo.getSafetySourceIssue().getDeduplicationId();"
+        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/service/java/com/android/safetycenter/SafetyCenterService.java"
-            line="651"
-            column="40"/>
+            file="packages/modules/Permission/service/java/com/android/safetycenter/data/SafetyCenterIssueDeduplicator.java"
+            line="317"
+            column="67"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `getDeduplicationGroup`">
+        message="Call requires API level 34 (current min is 33): `android.content.pm.PackageManager#getPackageUidAsUser`"
+        errorLine1="                        packageManager.getPackageUidAsUser("
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="packages/modules/Permission/service/java/com/android/safetycenter/data/SafetyCenterIssueDeduplicator.java"
-            line="315"/>
+            file="packages/modules/Permission/service/java/com/android/safetycenter/SafetyCenterService.java"
+            line="732"
+            column="40"/>
     </issue>
 
     <issue
         id="NewApi"
-        message="Call requires API level 34 (current min is 33): `getDeduplicationId`">
+        message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
+        errorLine1="        return UserHandle.of(userId).getUid(appId);"
+        errorLine2="                                     ~~~~~~">
         <location
-            file="packages/modules/Permission/service/java/com/android/safetycenter/data/SafetyCenterIssueDeduplicator.java"
-            line="316"/>
+            file="packages/modules/Permission/service/java/com/android/permission/compat/UserHandleCompat.java"
+            line="57"
+            column="38"/>
     </issue>
 
 </issues>
\ No newline at end of file