PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix settings crash for non-fingerpirnt devices

Browse Source 
Test: Verified that Settings does not crash on non-fingerprint devices
Flag: EXEMPT bugfix
Fixes: b/350635316
Change-Id: Ia6be6672cf8f8d84b2503fdb305a0217224a864d
This commit is contained in:
Joshua McCloskey
2024-07-22 18:32:33 +00:00
parent c8c8c53760
commit cfb087632c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
View File

@@ -16,7 +16,9 @@
package com.android.settings.biometrics.fingerprint2 package com.android.settings.biometrics.fingerprint2
import android.content.pm.PackageManager
import android.hardware.fingerprint.FingerprintManager import android.hardware.fingerprint.FingerprintManager
import android.os.ServiceManager.ServiceNotFoundException
import android.view.MotionEvent import android.view.MotionEvent
import android.view.accessibility.AccessibilityManager import android.view.accessibility.AccessibilityManager
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
@@ -74,8 +76,15 @@ class BiometricsEnvironment(context: SettingsApplication) : ViewModelStoreOwner
private val backgroundDispatcher = executorService.asCoroutineDispatcher() private val backgroundDispatcher = executorService.asCoroutineDispatcher()
private val applicationScope = MainScope() private val applicationScope = MainScope()
private val gateKeeperPasswordProvider = GatekeeperPasswordProvider(LockPatternUtils(context)) private val gateKeeperPasswordProvider = GatekeeperPasswordProvider(LockPatternUtils(context))
private val fingerprintManager = private val fingerprintManager = try {
context.getSystemService(FragmentActivity.FINGERPRINT_SERVICE) as FingerprintManager? if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
context.getSystemService(FragmentActivity.FINGERPRINT_SERVICE) as FingerprintManager?
} else {
null
}
} catch (exception: ServiceNotFoundException){
null
}
private val fingerprintSensorRepository: FingerprintSensorRepository = private val fingerprintSensorRepository: FingerprintSensorRepository =
FingerprintSensorRepositoryImpl(fingerprintManager, backgroundDispatcher, applicationScope) FingerprintSensorRepositoryImpl(fingerprintManager, backgroundDispatcher, applicationScope)