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

Fix Profile Fingerprint Settings to use correct user id

Browse Source 
Bug: 26790762
Change-Id: Id813c03041e6e727f535ec63f63ee8b187b06164
This commit is contained in:
Clara Bayarri
2016-01-26 16:36:48 +00:00
parent 40c0bf3ffc
commit 4f5f7b4f9a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -579,7 +579,8 @@ public class ChooseLockGeneric extends SettingsActivity {
private void removeAllFingerprintTemplatesAndFinish() { private void removeAllFingerprintTemplatesAndFinish() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected() if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.getEnrolledFingerprints().size() > 0) { && mFingerprintManager.getEnrolledFingerprints().size() > 0) {
mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback); mFingerprintManager.remove(
new Fingerprint(null, 0, 0, 0), mUserId, mRemovalCallback);
} else { } else {
finish(); finish();
} }

2
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -84,7 +84,7 @@ public class FingerprintEnrollSidecar extends InstrumentedFragment {
mFingerprintManager.setActiveUser(mUserId); mFingerprintManager.setActiveUser(mUserId);
} }
mFingerprintManager.enroll(mToken, mEnrollmentCancel, mFingerprintManager.enroll(mToken, mEnrollmentCancel,
0 /* flags */, mEnrollmentCallback, mUserId); 0 /* flags */, mUserId, mEnrollmentCallback);
mEnrolling = true; mEnrolling = true;
} }

6
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -286,7 +286,6 @@ public class FingerprintSettings extends SubSettings {
mUserId = getActivity().getIntent().getIntExtra( mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId()); Intent.EXTRA_USER_ID, UserHandle.myUserId());
Activity activity = getActivity(); Activity activity = getActivity();
mFingerprintManager = (FingerprintManager) activity.getSystemService( mFingerprintManager = (FingerprintManager) activity.getSystemService(
Context.FINGERPRINT_SERVICE); Context.FINGERPRINT_SERVICE);
@@ -536,16 +535,17 @@ public class FingerprintSettings extends SubSettings {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
intent.putExtra(Intent.EXTRA_USER_ID, mUserId); intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST); startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
} }
} }
private void deleteFingerPrint(Fingerprint fingerPrint) { private void deleteFingerPrint(Fingerprint fingerPrint) {
mFingerprintManager.remove(fingerPrint, mRemoveCallback); mFingerprintManager.remove(fingerPrint, mUserId, mRemoveCallback);
} }
private void renameFingerPrint(int fingerId, String newName) { private void renameFingerPrint(int fingerId, String newName) {
mFingerprintManager.rename(fingerId, newName); mFingerprintManager.rename(fingerId, mUserId, newName);
updatePreferences(); updatePreferences();
} }