Commit Graph

1088 Commits

Author SHA1 Message Date
TreeHugger Robot
6ba128762f Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev 2017-08-15 22:23:57 +00:00
Felipe Leme
2220049d58 Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
am: a3c2cee055

Change-Id: Ie107dd462a47009a34ee3768183dfda2e36107c3
2017-08-15 21:48:32 +00:00
Charles He
77f3300f48 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80
am: b0fa5855dc

Change-Id: Iaadf2350cd86ffc598e666e0d9dc735e5a7889f0
2017-08-15 21:35:05 +00:00
Felipe Leme
a3c2cee055 Merge "Additional documentation about Autofill / WebView security." into oc-dev
am: 36cbdef880

Change-Id: Ie198dbbdc7ab4ea1089c7363f1b1d2df333c1d8f
2017-08-15 21:33:01 +00:00
Charles He
b0fa5855dc [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
am: 0fa9328b80

Change-Id: I4fc74296d3da5fef830e9ffe0eedc74bb4fb047b
2017-08-15 21:16:36 +00:00
TreeHugger Robot
36cbdef880 Merge "Additional documentation about Autofill / WebView security." into oc-dev 2017-08-15 21:12:32 +00:00
Android Build Merger (Role)
0fa9328b80 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
2017-08-15 20:47:03 +00:00
TreeHugger Robot
3d141421f8 Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev 2017-08-15 20:24:27 +00:00
Charles He
40317127f4 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
b1141b6ff0 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Lucas Dupin
416fe954e9 Improved WallpaperService.Engine tests
Using final variables when possible, also testing if
overlaping invalidation requests will be posted to
the handler.

Bug: 63585249
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Change-Id: I01cdbdfd5313e55d7a58c77f705aea0f6f817518
2017-08-15 10:19:48 -07:00
Felipe Leme
303b609eaa Additional documentation about Autofill / WebView security.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Fixes: 64114048
Fixes: 64337380
Fixes: 64125551

Change-Id: I375bb4712af875251fea4f3e572d92165643409a
2017-08-14 08:49:47 -07:00
Felipe Leme
dedf8f1f49 Fix CustomDescription so it allows multiple transformations per view id.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t
CustomDescriptionTest#applyMultipleTransformationsForSameField_matchFirst
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t
CustomDescriptionTest#applyMultipleTransformationsForSameField_matchSecond

Fixes: 64569686

Change-Id: I88ef848ba193a224b4e8c3391002dc5f0da5508f
2017-08-10 13:50:03 -07:00
Felipe Leme
052562c40f Calls CancellationSignal when onFillRequest() times out.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testCancellationSignalCalledAfterTimeout
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64034169

Change-Id: I501653405e8244543a4c27f736bacfa23d22e6f7
2017-08-10 11:17:27 -07:00
Felipe Leme
a5083c40d5 CharSequenceTransformation should not change anything when comparision fails.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.CharSequenceTransformationTest#testMismatch
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64482785

Change-Id: Ia6036e0a1c6f5f084e6b13c7bdd3a9e24be7ac1a
2017-08-09 15:30:06 -07:00
TreeHugger Robot
9d836b6312 Merge "Rate limit notifyColorsChanged()" into oc-mr1-dev 2017-08-09 20:07:48 +00:00
TreeHugger Robot
be3e4a6285 Merge "Minor Autofill changes after API council review." into oc-mr1-dev 2017-08-07 23:35:56 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Lucas Dupin
65b47650c8 Rate limit notifyColorsChanged()
Throttle onComputeColors to make sure that a wallpaper
won't affect general system health easily.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Fixes: 63585249
Change-Id: Ib4317c0b4d284d4cd4a640c24ec71b272b8493d0
2017-08-04 11:42:38 -07:00
Lucas Dupin
e09e5ef21b Merge "Multi-user and WallpaperColors" into oc-dr1-dev 2017-08-03 22:48:27 +00:00
Lucas Dupin
22b418448b Merge "Multi-user and WallpaperColors" into oc-mr1-dev 2017-08-03 16:23:41 +00:00
Lucas Dupin
50ba991655 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 18:34:00 -07:00
Lucas Dupin
26fb43c034 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 23:18:26 +00:00
Tarandeep Singh
9c4115a562 Merge "Fix keyboard focus in VR" into oc-dr1-dev
am: 986995d481

Change-Id: I693c1256583dc1081c6402668401c6aab2337d16
2017-08-02 22:59:51 +00:00
Tarandeep Singh
986995d481 Merge "Fix keyboard focus in VR" into oc-dr1-dev 2017-08-02 20:33:02 +00:00
Tarandeep Singh
e1cfcf4c4d Fix keyboard focus in VR
Consider this VirtualDisplay (VD) scenario:
HostActivity creates a VD which holds SettingsActivity. When EditText
on SettingsActivity is tapped, it gains focus.
On eventual taps, it loses focus i.e. the Window in VD loses focus and
the host activity in primary display gets the focus instead. This
happens because WM's TaskTapPointerEventListener.onPointerEvent()
is called on the default display only.

Root cause:
1. Tap detector isn't registered for non-default display.
2. Tap detector has no info on which displayId touch was received.
3. InputFlinger doesn't deliver InputMonitor events for
non-default displays (fixed in a separate CL)

Fixing above results in onPointerEvent(MotionEvent) to deliver the
Touch events successfully to VD. We restrict these changes to physical
multi-displays and VR VirtualDisplays (which uses virtual touch device).
[VrManagerService calls WMInternal.setVr2dDisplayId(int)]

In future, displayId should be part of InputEvent. Bug: 64258305

Bug: 62033391
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I3626f4de5aa9bcf905da9abd39f3ab1baefc4c48
2017-08-02 10:46:22 -07:00
Felipe Leme
c7cea5b79e Minor Autofill changes after API council review.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64262815
Fixes: 64262816
Fixes: 64263294

Change-Id: I18fa6f24c13233a54a5dae9061c07bcdadfaf4a7
2017-08-02 10:30:29 -07:00
Felipe Leme
d25050e2a4 Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I8de50b81273e89298a6276d8b17100c90361380e
2017-08-02 16:09:13 +00:00
Felipe Leme
32d4e30778 Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be
2017-08-02 16:00:41 +00:00
Felipe Leme
c8f0fd7076 Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev 2017-08-02 15:52:05 +00:00
Felipe Leme
27eb322ed2 Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev
am: 6829a1dace

Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b
2017-08-02 00:26:37 +00:00
Felipe Leme
2fb64c0b28 Clarifies how the autofill service should check for signature hashes.
Test: m update-api

Bug: 64125551
Fixes: 63991811

Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412
2017-08-01 12:51:58 -07:00
Felipe Leme
33681a94cf Cherry-picked some Autofill Javadoc improvements from master.
Test: m update-api

Bug: 64125551
Bug: 63669555
Bug: 63985284

Merged-in: Iba4817f682670e9fd6d891ae221e1fa415252e99
Change-Id: I82cbb54a522b2cf1dfb11aacc9735c932aa9af90
2017-07-31 10:18:03 -07:00
Felipe Leme
c0c6ab4ac1 Minor Autofill javadoc fix.
Test: no, thanks!

Bug: 64125551

Change-Id: Iba4817f682670e9fd6d891ae221e1fa415252e99
2017-07-31 10:12:08 -07:00
Felipe Leme
cb96f39155 Uses ParceledListSlice to allow larger number of datasets.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testAutofillLargeNumberOfDatasets
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 63669555

Change-Id: If0847da3bafa1bfd80ee8925e17aace82010aec9
2017-07-27 09:44:11 -07:00
Felipe Leme
e802d18f49 Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev 2017-07-27 15:11:22 +00:00
Felipe Leme
d0b18d665f Don't show Save UI when values filled by user belong to a dataset.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 63068654

Change-Id: Ia9c42d57b0e7c316bfd3c0ee29816db18ac478c1
2017-07-26 15:59:38 -07:00
Julia Reynolds
7635ab0a1b Differentiate dnd countdowns/countdowns to an alarm
Test: runtest systemui, manual
Change-Id: I63b6c6b4128c7c3551efc64f54ce3e55ab2de54d
Fixes: 36569568
2017-07-26 16:07:12 -04:00
Julia Reynolds
04964fe069 Merge "Fix xml loading for managed services" into oc-mr1-dev 2017-07-21 19:52:50 +00:00
Albert Chaulk
95a3528866 Merge "Add modified API to send more information to VrCore" into oc-dr1-dev
am: c48e304bbf

Change-Id: I1c93664e2300cb9e234cfbc1c453da30a60e61af
2017-07-21 18:33:53 +00:00
Julia Reynolds
d1bf5f0108 Fix xml loading for managed services
Noticed while adding a shell cmd to toggle notification assistants,
which is also included

Bug: 62263757
Test: runtest systemui-notification
Change-Id: I9bc0ee857abb8b9f60ab18ad740ca0a3b7d754ff
(cherry picked from commit 88facd4d9a)
2017-07-21 13:07:48 -04:00
Lucas Dupin
98eabbd68a Unhide invalidateColors API
Live wallpapers should be able to report their colors
to have better integration with O-DR visual framework.

Test: make
Bug: 62490115
Change-Id: Id4a61245087a0c6530f56e474ce258ca9528becc
Fixes: 63585249
2017-07-20 21:39:15 +00:00
Albert Chaulk
16d2397e2d Add modified API to send more information to VrCore
Currently, null is sent when a 2D intent is running.
Sending the component name and a flag instead allows
VrCore to determine which intent is currently running
and which layers on the display correspond to this
application.

The process ID of the current intent is also sent,
to allow association of buffers to the VR app.

Bug: 63709047, 63115025
Test: manual with prints

Change-Id: I164b577f2c578867fb953d92074ef3d2d31221a1
2017-07-20 16:44:47 -04:00
Felipe Leme
22101ca5a9 Don't show a custom description if any transformation fail.
That could result in an inconsistent, confusing UI. For example, if the
successfully description for a credit card was "Exp. date: 04/20", one with a
failure could be "Exp. date: /20" - it's better to not show a custom description
in these cases.

Test: CtsAutoFillServiceTestCases pass
Test: CustomDescriptionTest.failFirstFailAll
Test: CustomDescriptionTest.failSecondFailAll

Bug: 62534917

Change-Id: I6554e3470ead2f84d7ef8715192d863c01ab1190
2017-07-18 17:40:45 -07:00
Felipe Leme
906b853717 Uses Pattern instead of String for new Autofill Save API.
Test: CtsAutoFillServiceTestCases pass
Bug: 62534917

Change-Id: Ic285838465c2aa55e4935cdd8f00c551faa6a972
2017-07-18 17:40:45 -07:00
Felipe Leme
7fc29dd931 Changed SaveInfo so it supports just optional ids.
Test: existing CtsAutoFillServiceTestCases pass
Test: new tests on LoginActivityTest pass
Test: new SaveInfoTest pass

Fixes: 38044993

Change-Id: Iefcf9610b27361585444157616325e9e9a89158f
2017-07-18 17:40:44 -07:00
Julia Reynolds
eb3dca71b5 Send less ranking reconsiderations and updates
- NotificationIntrusivenessExtractor does not need to reconsider
ranking for non intrusive notifications
- All adjustments (by group helper and the assistant) have been moved to
extractors so we can selectively send ranking updates instead of always
sending them.

Fixes: 62827235
Test: runtest systemui-notification
Change-Id: I2ea746c3883049abac0752788a3f4c2fa50c8064
2017-07-17 16:55:24 +00:00
Charles He
e74cae8f7c Fix security hole in GateKeeperResponse.
GateKeeperResponse has inconsistent writeToParcel() and
createFromParcel() methods, making it possible for a malicious app to
create a Bundle that changes contents after reserialization. Such
Bundles can be used to execute Intents with system privileges.

This CL changes writeToParcel() to make serialization and
deserialization consistent, thus fixing the issue.

Bug: 62998805
Test: use the debug app (see bug)
Change-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09
2017-07-14 14:36:11 +00:00