Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 0fdb8651 authored by Scott Mertz's avatar Scott Mertz Committed by Gerrit Code Review
Browse files

Merge Squashed Fingerprint Patches Into Stable [1/4]

See also:
  libhardware
  Settings
  SetupWizard

---
Fingerprint: Make the existing FingerprintService semi-useful.

- Add explicit actions for authentication so HW has
  a chance to power down when not in use.  The other
  option would be to start scanning when startListening
  is called, but that would force apps trying to enroll
  to start trying to authenticate immediately before they
  start enrollment.  That didn't seem like a good idea.
- Update to CM Fingerprint HAL 1-1.
- Extreme care needs to be taken to use this
  API.  It's not exactly robust against multiple
  clients stepping on each other.
- All of this goes away in M.

Squashed-Id: I6e34935cdec5e8eeabeac6f8cf9fb58e689cb889

Fingerprint [1/2]: Numerous Fingerprint Improvements

1. Introduce getEnrolledFingerprints
2. Introduce Fingerprint object to track name/id/userid
3. Store fingerprints in global settings instead of per user.
   This is because vendor implementations are also global.
4. Give newly enrolled fingerprints a default name.
5. Allow fingerprint names to be changed
6. When getting fingerprint data, merge the native stored fingerprints data
   with settings provider fingerprint data.
   - This is because the vendor will store the actual fingerprint, but all the
     metadata is stored by the provider.
7. Provide basic dump commands in fingerprints

See also:
  libhardware
  vendor specific hal implementation

Squashed-Id: Iafd2d2f568df5ec1e81f9252a784420ad05bbffe

Conflicts:
	core/java/android/provider/Settings.java

Enable fingerprint option in Settings [1/3]

See also:
frameworks/native
packages/apps/Settings

Squashed-Id: Iff62946abfdcaa8b3b588dd38877cf7b1ade282a

Keyguard: Authenticate with fingerprint

Squashed-Id: Id547339fc1b6e06b3a9d8f6906258872986df3f1

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

Keyguard: Show fallback after 2 failed auth attempts

Squashed-Id: Ifd73297d47dbb96351610401cf0e516d39c0ddb6

Keyguard: Show retry text on unidentified fingerprint

Squashed-Id: Ie42ce712b02ca3857a66e23b894ec31dc9eeb208

Conflicts:
	packages/SystemUI/res/values/cm_strings.xml

Keyguard: Add fingerprint icon to the bottom view

Squashed-Id: I7737a8de33c763119a1ac6b346479c0d757f1023

Keyguard: Increase time to show hint texts

Too short with current time. UX wants the messages to last longer.

Squashed-Id: I8e2fb8f182f99b78ff8510ea2275bc4c9fac134c

Fingerprint: Reset state when client cancels

Otherwise it is possible for the service to get stuck in
a non-idle state if the current task never finishes properly.

Squashed-Id: I0d9d90a2dfe7a2ac78efb66cc285d29fbb89a3c0

Add fingerprint permission [1/2]

See frameworks/base and Settings

Squashed-Id: Id330dea94902e4ed5a4c386143426805ccab0ba4

Conflicts:
	services/core/java/com/android/server/fingerprint/FingerprintService.java

Fingerprint: Secure the dump

CTS requires services to be protected.

Squashed-Id: Id80e8a722c40d6c1ca05da5412dd7589e28d5463

Conflicts:
	services/core/java/com/android/server/fingerprint/FingerprintService.java

Add fingerprint to DB before calling clients

Some clients may call getEnrolledFingerprints when they receive
onEnrollResult.  If the settings database is not updated before
that call there will be a mismatch between the fingerprints stored
natively, and those in the settings database, and when merging the two
lists the new fingerprint will end up being removed from the native
storage.

Squashed-Id: Ic45423f73939213b85c727cd6cbb048231605b47

SystemUI: Add uses-permission for fingerprint

Squashed-Id: Ie72ebdd594c744f14cd61249f89e180b83307ae4

Conflicts:
	packages/SystemUI/AndroidManifest.xml

Keyguard Fingerprint: Don't cancel if device doesn't have the feature

Squashed-Id: Ice042008d9a99270c4e51c384dfee24c97d0b1da

Fingerprint: Get current user id via Process.myUserHandle()

This eliminates the need for apps to have the
INTERACT_ACROSS_USERS and MANAGE_USERS permissions

Squashed-Id: I530eecf434046e2233664fb988665e6083707f6a

Fingerprint: Vibrate device.

Vibrate the device, if vibration is supported,
for 100ms upon fingerprint acquisition or enrollment.

Squashed-Id: I4d87c816c133542f4a26b332c3190bd4a8adecf0

Keyguard Fingerprint: Lock immediately when fp is used [1/2]

See also:
frameworks/base
packages/apps/Settings

Squashed-Id: I03db3130ffca3a530652d156df8008bd1cfd874c

Fingerprint: Add getNumEnrollmentSteps [1/2]

Add ability to query hal for num enrollment steps

Projects:
  frameworks/base
  libhardware
  vendor specific implementation

Squashed-Id: Id65ec257583f7fdcc18ee2bee25c7db76e982ffd

Keyguard Fingerprint: Send Unlock Stats

Squashed-Id: I2feac5db2604cef85ea9eafd69e1bc2272ff2d93

Conflicts:
	packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

Fingerprint: disallow API calls when fingerprint is not available

Squashed-Id: I90032095d81512e88a768959d093bf08122a81da

Conflicts:
	services/core/java/com/android/server/fingerprint/FingerprintService.java

Change-Id: Id8471e727db9e09030df435fe51b954be05810bc
parent 25832d11
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment