Commit Graph

2232 Commits

Author SHA1 Message Date
Kevin Chyn
88c76aef23 Merge "Add missing break statements in FingerprintManager" into oc-dev am: e25a2564e5
am: c7a3cf5850

Change-Id: I5d509bdb15a645ae002b0f9862644da3aac8b456
2017-05-13 00:42:52 +00:00
Kevin Chyn
c7a3cf5850 Merge "Add missing break statements in FingerprintManager" into oc-dev
am: e25a2564e5

Change-Id: Iae1ded28be8ea7df2c466ce2592a5574b1cee994
2017-05-13 00:32:46 +00:00
TreeHugger Robot
e25a2564e5 Merge "Add missing break statements in FingerprintManager" into oc-dev 2017-05-13 00:27:13 +00:00
Kevin Chyn
f8567234e0 Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82
am: 3ed8955aa3

Change-Id: Id8de8c421f31faa6ec30a8bd1e8d5d2585642363
2017-05-13 00:03:18 +00:00
Kevin Chyn
3ed8955aa3 Merge "strong fp lockout after 20 failed attempts" into oc-dev
am: 310818ff82

Change-Id: I52787e3db92ae9795932156335ee5c55f5c920a9
2017-05-12 23:49:48 +00:00
Kevin Chyn
e64399649a Add missing break statements in FingerprintManager
Fixes: 38268065

Test: manual

Change-Id: I64ac92b2c5682bcaa494f43ff5defdf9915c5a65
2017-05-12 14:57:32 -07:00
Kevin Chyn
df9d33e903 strong fp lockout after 20 failed attempts
Fingerprint currently locks out for 30s after every 5 failed attempts.

This change makes it so that in addition to the above,
PIN/pattern/password will be required after 20 failed attempts.

Fixes: 35954316

Test: manual
Change-Id: I3aeb0e5b5b4d5011555f60fbe6cc2c1ce702a670
2017-05-12 13:01:01 -07:00
Kevin Chyn
fe822a101e Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev am: 6fddc2472e
am: 7096712148

Change-Id: I5f392cb23da265eecfdb07456066ba1b3c376d2d
2017-05-11 06:43:14 +00:00
TreeHugger Robot
424e328bba Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev 2017-05-11 03:55:40 +00:00
Santos Cordon
b0608636a2 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
Merged-In: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
2017-05-11 01:52:53 +00:00
Santos Cordon
527b92c8d8 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" 2017-05-11 01:48:26 +00:00
Kevin Chyn
7096712148 Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
am: 6fddc2472e

Change-Id: I3493866a4e594a186f897b02dca0773e4a7a0d49
2017-05-11 01:13:10 +00:00
Bryce Lee
5cfde635e3 Merge "Use application context getting secondary displays." into oc-dev am: 456882b5ae
am: 356cccd67c

Change-Id: I291e1249e9e0b5a975faade4ee105b3e6711db67
2017-05-10 23:04:38 +00:00
Kevin Chyn
7a6b44bcee AuthenticationCallback should not be cleared onAuthenticationFailed
Fixes: 38197608

Test: 1) enroll a finger
2) enter keyguard, touch sensor with an unenrolled finger
3) touch sensor with enrolled finger
4) phone should enter keyguard
5) do this test from screen off as well

Change-Id: I1c7b060888128b4a6b492fd6a7a8ebc85d2b3353
2017-05-10 14:39:55 -07:00
TreeHugger Robot
baed8c1321 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp 2017-05-10 21:18:51 +00:00
Santos Cordon
023b6b9d23 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
2017-05-10 13:03:32 -07:00
Bryce Lee
356cccd67c Merge "Use application context getting secondary displays." into oc-dev
am: 456882b5ae

Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93
2017-05-10 19:22:15 +00:00
Bryce Lee
456882b5ae Merge "Use application context getting secondary displays." into oc-dev 2017-05-10 16:27:14 +00:00
Tomasz Wasilczyk
b61b618aed Merge "Implement tune, cancel and getProgramInformation calls of ITuner." 2017-05-10 15:15:20 +00:00
Santos Cordon
ee8931e258 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
2017-05-09 18:17:39 -07:00
Tomasz Wasilczyk
37d986d17d Implement tune, cancel and getProgramInformation calls of ITuner.
Test: instrumentation
Bug: b/36863239
Change-Id: I7c0faacec7beccddc29f3f207ba6a166cb53e60c
2017-05-09 10:43:13 -07:00
Bryce Lee
c406152f5f Use application context getting secondary displays.
Activity contexts include override configurations in their resources
associated with the primary display. There currently is no way to
specify overrides for another display from the same context. As a
result, getting metrics for other displays will reflect the metrics
of the context's display.

This change provides the application context when we create a display
if the display id does not match the display associated with the
context.

Change-Id: I68a7b609ead6d7cc652d36e7e8af432700af8efa
Fixes:37923030
Test: cts-tradefed run cts-dev --module CtsDisplayTestCases --test android.display.cts.DisplayTest#testActivityContextGetMetrics
2017-05-09 10:40:23 -07:00
TreeHugger Robot
764b7370ad Merge "Add API for querying if a given keyphrase/locale is supported for AOHD." 2017-05-09 03:41:15 +00:00
Chien-Yu Chen
b8cc2c2179 Merge changes from topic 'enableZslApi' into oc-dev am: 9414a25592
am: fe04ad53de

Change-Id: Ia0f9272d92b90abf660e2515785fb519c9e87153
2017-05-08 22:50:52 +00:00
Chien-Yu Chen
fe04ad53de Merge changes from topic 'enableZslApi' into oc-dev
am: 9414a25592

Change-Id: I9d4fb74e37782f269966dda855f716e24ed42000
2017-05-08 22:33:56 +00:00
Chris Thornton
bf8288ce34 Add API for querying if a given keyphrase/locale is supported for AOHD.
Test: Use test VoiceInteraction app to verify function behaves as
expected, and no longer crashes in the framework if you try to use a
AOHD with a null KeyphraseEnrollmentMetaData object.

Change-Id: I12923b8ebf37e6de9be336b4397c24679c86fff8
2017-05-08 15:31:58 -07:00
TreeHugger Robot
9414a25592 Merge changes from topic 'enableZslApi' into oc-dev
* changes:
  camera: Clarify TEMPLATE_ZERO_SHUTTER_LAG
  camera: Clarify ZSL supports
2017-05-08 22:28:38 +00:00
Kevin Chyn
22612c7297 Merge "Fix AuthenticationCallback leak in FingerprintManager" into oc-dev am: a0cd8eb55d
am: 6935c33abd

Change-Id: Ib417427684e6e916fd517f6648eb74c573a0945b
2017-05-08 21:11:14 +00:00
Kevin Chyn
6935c33abd Merge "Fix AuthenticationCallback leak in FingerprintManager" into oc-dev
am: a0cd8eb55d

Change-Id: If67639ed1f93f76a1ed225209869545572571484
2017-05-08 20:58:17 +00:00
Kevin Chyn
d717808bd0 Fix AuthenticationCallback leak in FingerprintManager
Fixes: 32295793

Test: 1) modify/build/run apk attached in BR
2) run garbage collection after FingerprintActivity is done
3) use HPROF, FingerprintActivity should have "0 total count"
4) do this test for auth success, auth fail, auth cancel

Change-Id: I5fe7937a26d4673226b87c9c95a136dd9510e21f
2017-05-07 22:42:22 +00:00
Tomasz Wasilczyk
1ae34f900b Merge "Implement step and scan calls of ITuner." 2017-05-06 03:32:59 +00:00
Tomasz Wasilczyk
2383793eae Implement step and scan calls of ITuner.
Test: instrumentation
Bug: b/36863239
Change-Id: I8c089321a3e45f8ede8d8231ffd0dc5734db0bb5
2017-05-05 13:55:27 -07:00
Tomasz Wasilczyk
8a3e865cf0 Merge "Dummy implementation get/setMute calls of ITuner." 2017-05-05 14:35:21 +00:00
Siarhei Vishniakou
6a9ad74c29 Merge "Adding feature: input device disable/enable." 2017-05-04 18:51:27 +00:00
Tomasz Wasilczyk
9fa0287c18 Dummy implementation get/setMute calls of ITuner.
This is also not implemented in the native service.

Test: instrumentation
Bug: b/36863239
Change-Id: I2e5ceaec7a98eec0af6101a2f91dabd1cde2e090
2017-05-04 08:13:05 -07:00
Chien-Yu Chen
6828bb92bd camera: Clarify TEMPLATE_ZERO_SHUTTER_LAG
Clarify that TEMPLATE_ZERO_SHUTTER_LAG is intended for application
operated ZSL.

Test: make
Bug: 34689167
Change-Id: Ice5fcb11ce43b411376d22976741720a5abbf322
2017-05-03 12:41:39 -07:00
Chien-Yu Chen
8102638c71 camera: Clarify ZSL supports
For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG
template.

Test: make
Bug: 34689167
Change-Id: I39dba6f9a23a8c714c31cf5fb825a8bee3f01f2b
2017-05-03 12:41:07 -07:00
Tomasz Wasilczyk
ecfd85f5b4 Merge "Implement get/setConfiguration calls of ITuner." 2017-05-03 15:42:37 +00:00
Tomasz Wasilczyk
8b6db4f2eb Implement get/setConfiguration calls of ITuner.
Test: instrumentation
Bug: b/36863239
Change-Id: I0954f8f837c342b35873d3ae834bab83bc3cb04c
2017-05-02 15:33:52 -07:00
Siarhei Vishniakou
a7f99b5ea8 Adding feature: input device disable/enable.
This functionality will only be available for signed system applications.
A disable call will cause a file descriptor to the input device
driver to be closed, which in turn may cause the input device
to switch into a low-power mode.
An enable call will reopen the input device.

Bug: 30143923
Test: developed a custom apk with signature permission that
calls disable/enable on touchscreen device. Verified that
touchscreen stops working when disable is called and starts
working again when enable is called. Verified that the file
handle to the driver is closed and reopened. Verified that
the notification onInputDeviceChanged is received in the app.
CTS test - android.view.cts.InputDeviceEnabledTest

Change-Id: I1e42c6996e679c083cd3f0c9adfaef8ba22c4ee4
2017-05-01 11:52:13 -07:00
Tomasz Wasilczyk
7dda2cb65b Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872 am: 3329b63b40
am: ffe7134de5

Change-Id: I8697d26ff3f3cd13a5504432e2689d219d8bba1d
2017-04-28 21:56:47 +00:00
Tomasz Wasilczyk
ffe7134de5 Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2 am: 5acbf70872
am: 3329b63b40

Change-Id: I45bf3234ccc66e5bcac071c0931846eed2e27f2b
2017-04-28 21:46:20 +00:00
Tomasz Wasilczyk
3329b63b40 Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
am: 5acbf70872

Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c
2017-04-28 20:25:43 +00:00
Dianne Hackborn
d3439c7ab5 Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev am: 9cd47a8ff2
am: a0f1fb6b06

Change-Id: Id761a81dd6127f2a1bd05f2e392d8867d7e86e1c
2017-04-28 18:56:44 +00:00
Dianne Hackborn
9cd47a8ff2 Merge "Fix issue #37714224: API Review: ACTION_NEW_VIDEO" into oc-dev 2017-04-28 18:10:39 +00:00
Tomasz Wasilczyk
dd767065fe Fix equality method implementation in BandConfig class.
Test: instrumentation (in master branch)
Bug: b/36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
2017-04-28 08:19:34 -07:00
Mathias Agopian
10a9821861 Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev am: b9a2e32130
am: 930442f769

Change-Id: Icc55dde7d080b5f1349a6d49c751f8b5708e88a7
2017-04-28 01:50:11 +00:00
Mathias Agopian
910ab13e66 Plumb gralloc producer/consumer bits correctly
Bug: 33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
2017-04-28 00:13:29 +00:00
Dianne Hackborn
c154195d27 Fix issue #37714224: API Review: ACTION_NEW_VIDEO
Test: none, docs only.

Change-Id: Id6e3667884a5907c0877aabb3760fac88863ff7a
2017-04-27 10:56:12 -07:00
Peng Xu
ed2986ca91 Merge "[Stability]: fix system_server crash issue caused by fd leak." into oc-dev am: 3ab258c98d
am: 5d34ce7f65

Change-Id: If08c2b50114940ff75795f4c15b005ece7958b6b
2017-04-27 05:09:46 +00:00