diff options
| author | Jim Miller <jaggies@google.com> | 2015-03-24 16:02:59 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-03-24 16:02:59 -0700 |
| commit | d16c9b7c3100b7ba653dcd58db036500dd220896 (patch) | |
| tree | aafa73c356e6dbcbbcabac02cce627dbe3ebdbe6 /src/com/android/settings/SecuritySettings.java | |
| parent | c24adcdf83debcf204b4cae7513aeabe18d8a1af (diff) | |
| download | packages_apps_Settings-d16c9b7c3100b7ba653dcd58db036500dd220896.zip packages_apps_Settings-d16c9b7c3100b7ba653dcd58db036500dd220896.tar.gz packages_apps_Settings-d16c9b7c3100b7ba653dcd58db036500dd220896.tar.bz2 | |
Update Settings to use new fingerprint API
Bug 16487912
Change-Id: I99ac78f476d43f6b87f5dd20e597c51ed08d2c0e
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 1f6d50a..4ca2140 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -40,8 +40,8 @@ import android.preference.PreferenceScreen; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.security.KeyStore; +import android.service.fingerprint.Fingerprint; import android.service.fingerprint.FingerprintManager; -import android.service.fingerprint.FingerprintManager.FingerprintItem; import android.service.trust.TrustAgentService; import android.telephony.TelephonyManager; import android.telephony.SubscriptionManager; @@ -341,8 +341,8 @@ public class SecuritySettings extends SettingsPreferenceFragment fingerprintPreference.setKey(KEY_FINGERPRINT_SETTINGS); fingerprintPreference.setTitle(R.string.security_settings_fingerprint_preference_title); Intent intent = new Intent(); - List<FingerprintItem> items = fpm.getEnrolledFingerprints(); - int fingerprintCount = items.size(); + final List<Fingerprint> items = fpm.getEnrolledFingerprints(); + final int fingerprintCount = items != null ? items.size() : 0; final String clazz; if (fingerprintCount > 0) { fingerprintPreference.setSummary(getResources().getQuantityString( |