Settings: AppLock: Update for kotlin errors

Change-Id: I7115c6e2031d613e59859710f587ee2a26614001
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

src/com/android/settings/security/applock/AppLockBiometricPreferenceController.kt

@@ -36,8 +36,8 @@ class AppLockBiometricPreferenceController(
     private val coroutineScope: CoroutineScope
 ) : AppLockTogglePreferenceController(context, KEY) {
 
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
-    private val biometricManager = context.getSystemService(BiometricManager::class.java)
+    private val biometricManager = context.getSystemService(BiometricManager::class.java)!!
 
     private var preference: Preference? = null
     private var isBiometricsAllowed = false
@@ -73,4 +73,4 @@ class AppLockBiometricPreferenceController(
         super.displayPreference(screen)
         preference = screen.findPreference(preferenceKey)
     }
-}
+}

src/com/android/settings/security/applock/AppLockCredentialActivity.kt

@@ -74,7 +74,9 @@ class AppLockCredentialActivity : FragmentActivity() {
 
         override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
             waitingForBiometricCallback = false
-            appLockManager.unlockPackage(packageName)
+            packageName?.let { nonNullPackageName ->
+                appLockManager.unlockPackage(nonNullPackageName)
+            }
             ConfirmDeviceCredentialUtils.checkForPendingIntent(this@AppLockCredentialActivity)
             setResult(Activity.RESULT_OK)
             finish()
@@ -99,7 +101,7 @@ class AppLockCredentialActivity : FragmentActivity() {
             statusBarColor = Color.TRANSPARENT
         }
 
-        appLockManager = getSystemService(AppLockManager::class.java)
+        appLockManager = getSystemService(AppLockManager::class.java)!!
         userManager = UserManager.get(this)
         lockPatternUtils = LockPatternUtils(this)
 

src/com/android/settings/security/applock/AppLockHideAppPC.kt

@@ -35,7 +35,7 @@ class AppLockHideAppPC(
     private val coroutineScope: CoroutineScope
 ) : AppLockTogglePreferenceController(context, KEY) {
 
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
     private var hideFromLauncher = AppLockManager.DEFAULT_HIDE_IN_LAUNCHER
     private var preference: Preference? = null
 
@@ -67,4 +67,4 @@ class AppLockHideAppPC(
         super.displayPreference(screen)
         preference = screen.findPreference(preferenceKey)
     }
-}
+}

src/com/android/settings/security/applock/AppLockNotificationRedactionPC.kt

@@ -35,7 +35,7 @@ class AppLockNotificationRedactionPC(
     private val coroutineScope: CoroutineScope
 ) : AppLockTogglePreferenceController(context, KEY) {
 
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
     private var shouldRedactNotification = AppLockManager.DEFAULT_REDACT_NOTIFICATION
     private var preference: Preference? = null
 
@@ -69,4 +69,4 @@ class AppLockNotificationRedactionPC(
         super.displayPreference(screen)
         preference = screen.findPreference(preferenceKey)
     }
-}
+}

src/com/android/settings/security/applock/AppLockPackageConfigFragment.kt

@@ -52,8 +52,7 @@ class AppLockPackageConfigFragment : DashboardFragment() {
             requireActivity(),
             this,
             header?.findViewById(R.id.entity_header)
-        ).setRecyclerView(listView, settingsLifecycle)
+        ).setPackageName(packageInfo.packageName)
-            .setPackageName(packageInfo.packageName)
             .setButtonActions(
                 EntityHeaderController.ActionType.ACTION_NONE,
                 EntityHeaderController.ActionType.ACTION_NONE
@@ -61,7 +60,7 @@ class AppLockPackageConfigFragment : DashboardFragment() {
             .bindHeaderButtons()
             .setLabel(appEntry)
             .setIcon(appEntry)
-            .done(requireActivity(), false /* rebindActions */)
+            .done(false /* rebindActions */)
     }
 
     override protected fun createPreferenceControllers(

src/com/android/settings/security/applock/AppLockPackageListFragment.kt

@@ -53,7 +53,7 @@ class AppLockPackageListFragment : DashboardFragment() {
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        appLockManager = context.getSystemService(AppLockManager::class.java)
+        appLockManager = context.getSystemService(AppLockManager::class.java)!!
         pm = context.packageManager
         launchablePackages = Utils.launchablePackages(context)
         whiteListedPackages = resources.getStringArray(
@@ -67,10 +67,10 @@ class AppLockPackageListFragment : DashboardFragment() {
             val preferences = withContext(Dispatchers.Default) {
                 pm.getInstalledPackages(
                     PackageInfoFlags.of(PackageManager.MATCH_ALL.toLong())
-                ).filter {
+                ).filter { packageInfo ->
-                    !it.applicationInfo.isSystemApp() ||
+                    val isSystemApp = packageInfo.applicationInfo?.isSystemApp ?: false
-                        launchablePackages.contains(it.packageName) ||
+                    !isSystemApp || launchablePackages.contains(packageInfo.packageName) ||
-                        whiteListedPackages.contains(it.packageName)
+                        whiteListedPackages.contains(packageInfo.packageName)
                 }.sortedWith { first, second ->
                     getLabel(first).compareTo(getLabel(second))
                 }
@@ -108,14 +108,14 @@ class AppLockPackageListFragment : DashboardFragment() {
     }
 
     private fun getLabel(packageInfo: PackageInfo) =
-        packageInfo.applicationInfo.loadLabel(pm).toString()
+        packageInfo.applicationInfo?.loadLabel(pm).toString()
 
     private fun createPreference(packageInfo: PackageInfo, isProtected: Boolean): Preference {
         val label = getLabel(packageInfo)
         return PrimarySwitchPreference(requireContext()).apply {
             key = packageInfo.packageName
             title = label
-            icon = packageInfo.applicationInfo.loadIcon(pm)
+            icon = packageInfo.applicationInfo?.loadIcon(pm)
             setIconSize(ICON_SIZE_MEDIUM)
             isChecked = isProtected
             setOnPreferenceChangeListener { _, newValue ->

src/com/android/settings/security/applock/AppLockPackageProtectionPC.kt

@@ -36,7 +36,7 @@ class AppLockPackageProtectionPC(
     private val coroutineScope: CoroutineScope
 ) : AppLockTogglePreferenceController(context, KEY) {
 
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
     private var isProtected = false
     private var preference: Preference? = null
 
@@ -70,4 +70,4 @@ class AppLockPackageProtectionPC(
         super.displayPreference(screen)
         preference = screen.findPreference(preferenceKey)
     }
-}
+}

src/com/android/settings/security/applock/AppLockSettingsPreferenceController.kt

@@ -54,7 +54,7 @@ class AppLockSettingsPreferenceController(
     LifecycleEventObserver {
 
     private val lockPatternUtils = LockPatternUtils(context)
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
     private var preference: Preference? = null
     private val securityPromptLauncher: ActivityResultLauncher<Intent>?
 
@@ -120,7 +120,7 @@ class AppLockSettingsPreferenceController(
             val title = mContext.getString(R.string.app_lock_authentication_dialog_title)
             val intent = Intent().apply {
                 setClassName(SETTINGS_PACKAGE_NAME,
-                        ConfirmDeviceCredentialActivity::class.qualifiedName)
+                        ConfirmDeviceCredentialActivity::class.qualifiedName!!)
                 putExtra(KeyguardManager.EXTRA_TITLE, title)
             }
             securityPromptLauncher.launch(intent)
@@ -128,4 +128,4 @@ class AppLockSettingsPreferenceController(
         }
         return super.handlePreferenceTreeClick(preference)
     }
-}
+}

src/com/android/settings/security/applock/AppLockTimeoutPreferenceController.kt

@@ -30,7 +30,7 @@ class AppLockTimeoutPreferenceController(
 ) : BasePreferenceController(context, key),
     Preference.OnPreferenceChangeListener {
 
-    private val appLockManager = context.getSystemService(AppLockManager::class.java)
+    private val appLockManager = context.getSystemService(AppLockManager::class.java)!!
 
     override fun getAvailabilityStatus() = AVAILABLE
 
@@ -44,4 +44,4 @@ class AppLockTimeoutPreferenceController(
         appLockManager.timeout = (newValue as String).toLong()
         return true
     }
-}
+}

src/com/android/settings/security/applock/AppLockTogglePreferenceController.kt

@@ -17,7 +17,8 @@
 package com.android.settings.security.applock;
 
 import android.content.Context
-import android.widget.Switch
+import android.widget.CompoundButton
+import android.widget.CompoundButton.OnCheckedChangeListener
 
 import androidx.preference.Preference
 import androidx.preference.PreferenceScreen
@@ -25,13 +26,12 @@ import androidx.preference.PreferenceScreen
 import com.android.settings.R
 import com.android.settings.core.TogglePreferenceController
 import com.android.settingslib.widget.MainSwitchPreference
-import com.android.settingslib.widget.OnMainSwitchChangeListener
 
 abstract class AppLockTogglePreferenceController(
     context: Context,
     key: String,
 ) : TogglePreferenceController(context, key),
-    OnMainSwitchChangeListener {
+    OnCheckedChangeListener {
 
     override fun displayPreference(screen: PreferenceScreen) {
         super.displayPreference(screen)
@@ -41,9 +41,9 @@ abstract class AppLockTogglePreferenceController(
         }
     }
 
-    override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
+    override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
         setChecked(isChecked)
     }
 
     override fun getSliceHighlightMenuRes() = R.string.menu_key_security
-}
+}