commit e63322f640cf955ba296e064b07e4920d334f851
author Maurice Lam <yukl@google.com> Wed Jul 15 14:57:06 2015 -0700
committer Maurice Lam <yukl@google.com> Wed Jul 15 14:57:06 2015 -0700
tree 5999aad92fa346ccb7dbfd24355ff691ad9c42ec
parent b6cb215cbefc803b0a1510a7f7c606d4d5c10045
parent f90628c6ec8cf80b44b9559db448eb9537b41fdc

resolved conflicts for merge of f90628c6 to mnc-dr-dev

Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 64e7690..d656d24 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -40,7 +40,7 @@
         setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
         findViewById(R.id.cancel_button).setOnClickListener(this);
         findViewById(R.id.learn_more_button).setOnClickListener(this);
-        final double passwordQuality = new ChooseLockSettingsHelper(this).utils()
+        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
                 .getActivePasswordQuality(UserHandle.myUserId());
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
     }