Snap for 8523903 from 565380598d937d8d9f7959deb93f507153e8651d to main-cg-testing-releasemain-cg-testing-release

Change-Id: I3df83e5432c563e67284e105bc733edf8bed4a13

6 files changed, 13 insertions, 9 deletions

diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index 37dddd197..0923db371 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -145,4 +145,6 @@ android_app {
     },
 
     plugins: ["java_api_finder"],
+
+    kotlincflags: ["-Xjvm-default=enable"],
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/UnusedAppsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/UnusedAppsFragment.kt
index 73aeb76e2..f7bd8baf9 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/UnusedAppsFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/UnusedAppsFragment.kt
@@ -150,7 +150,7 @@ class UnusedAppsFragment<PF, UnusedAppPref> : Fragment()
     private fun createPreferenceScreen() {
         val preferenceFragment: PF = requirePreferenceFragment()
         val preferenceScreen = preferenceFragment.preferenceManager.inflateFromResource(
-            context,
+            context!!,
             R.xml.unused_app_categories,
             /* rootPreferences= */ null)
         preferenceFragment.preferenceScreen = preferenceScreen
@@ -381,4 +381,4 @@ class UnusedAppsFragment<PF, UnusedAppPref> : Fragment()
          */
         fun setEmptyState(empty: Boolean)
     }
-}
\ No newline at end of file
+}
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
index a7006683b..a97477bc2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoUnusedAppsFragment.kt
@@ -71,7 +71,7 @@ class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
     }
 
     override fun createFooterPreference(context: Context): Preference {
-        val preference = Preference(context)
+        val preference = Preference(context!!)
         if (isHibernationEnabled()) {
             preference.summary = getString(R.string.unused_apps_page_summary)
         } else {
@@ -115,11 +115,11 @@ class AutoUnusedAppsFragment : AutoSettingsFrameFragment(),
     }
 
     private fun createNoUnusedAppsPreference(): Preference {
-        val preference = Preference(context)
+        val preference = Preference(context!!)
         preference.title = getString(R.string.zero_unused_apps)
         preference.key = UNUSED_PREFERENCE_KEY
         preference.isSelectable = false
         preference.order = 0
         return preference
     }
-}
\ No newline at end of file
+}
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/FooterPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/FooterPreference.kt
index 00aae0d8b..7864abbb2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/FooterPreference.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/FooterPreference.kt
@@ -45,9 +45,9 @@ class FooterPreference : Preference {
 
     private var secondSummaryView: TextView? = null
 
-    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
-        secondSummaryView = holder?.findViewById(R.id.summary2) as TextView
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        secondSummaryView = holder.findViewById(R.id.summary2) as TextView
         secondSummaryView?.text = secondSummary
         super.onBindViewHolder(holder)
     }
-}
\ No newline at end of file
+}
diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp
index e7da1c530..723360b11 100644
--- a/PermissionController/tests/mocking/Android.bp
+++ b/PermissionController/tests/mocking/Android.bp
@@ -111,4 +111,6 @@ android_test {
         "device-tests",
         "mts-permission",
     ],
+
+    kotlincflags: ["-Xjvm-default=enable"],
 }
diff --git a/framework-s/Android.bp b/framework-s/Android.bp
index 22dce7e84..7cce4a4a1 100644
--- a/framework-s/Android.bp
+++ b/framework-s/Android.bp
@@ -70,7 +70,7 @@ java_sdk_library {
     lint: {
         strict_updatability_linting: true,
     },
-    min_sdk_version: "30",
+    min_sdk_version: "31",
     permitted_packages: [
         "android.permission",
         "android.app.role",