Commit Graph

73381 Commits

Author SHA1 Message Date
Robert Carr
e64d0028ae Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am: 48ed8aa4d0

Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503
2017-08-03 12:53:40 +00:00
TreeHugger Robot
48ed8aa4d0 Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev 2017-08-03 12:45:07 +00:00
Hugo Benichi
cf96a1b36d NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.

This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.

This patch also includes a couple of other small cleanups.

Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 37013369

(cherry picked from commit ff3e6ccca1)

Change-Id: Icf047532aa551fbe0a70721cfb95507eaa84d51e
2017-08-03 14:19:43 +09:00
Tarandeep Singh
7def2eea97 Merge "Fix keyboard focus in VR" into oc-dr1-dev
am: 986995d481

Change-Id: Ide81e21c24c6efd66c03c997dcaefbd0a3efd7b8
2017-08-02 20:42:08 +00:00
Tarandeep Singh
986995d481 Merge "Fix keyboard focus in VR" into oc-dr1-dev 2017-08-02 20:33:02 +00:00
Chien-Yu Chen
5a7aefdb3d Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
am: 615f9e1277

Change-Id: I1c14baa9dc756fc91b6db1ba7f947a6fa4a4c4e8
2017-08-02 20:05:22 +00:00
Chien-Yu Chen
615f9e1277 Merge "camera2: Fix template requirements" into oc-dev
am: 2976109d89

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26
2017-08-02 19:56:55 +00:00
TreeHugger Robot
2976109d89 Merge "camera2: Fix template requirements" into oc-dev 2017-08-02 19:43:31 +00:00
Jeff Sharkey
eb6733e93a Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am: 65abebbadd

Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54
2017-08-02 19:33:49 +00:00
Evan Rosky
756685b506 Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
am: ae938cee71

Change-Id: If8a2938a9f10a9c8b60b65323cd34713eeb95f40
2017-08-02 19:25:42 +00:00
TreeHugger Robot
65abebbadd Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev 2017-08-02 19:09:04 +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
Chad Brubaker
5813bc2b22 Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a
am: 531f1af615

Change-Id: I77240a60f796c63acd640b8a43cb7054ad2a8bee
2017-08-02 17:41:21 +00:00
Evan Rosky
9d93486ed6 Gracefully handle focus loops created by app dev.
Instead of ANR in an infinite loop, this will detect
a cycle and return null.

Bug: 62960867
Test: Added in CTS FocusFinderTest#testChainVisibility
Change-Id: Ifb4638e3350642f065c40b3bea112cc12efff447
2017-08-02 17:33:32 +00:00
Chad Brubaker
531f1af615 Merge "Add owners for the network security config" am: 8773730cd9
am: e9d50c793a

Change-Id: Id183ac68171c94d082c992bd3e986c136d6c7764
2017-08-02 17:27:51 +00:00
Chad Brubaker
e9d50c793a Merge "Add owners for the network security config"
am: 8773730cd9

Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177
2017-08-02 17:20:16 +00:00
Sundong Ahn
30538850f2 Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
am: 2785be7572

Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
2017-08-02 17:14:55 +00:00
Treehugger Robot
8773730cd9 Merge "Add owners for the network security config" 2017-08-02 17:10:11 +00:00
Sundong Ahn
2785be7572 Merge "Add hwbinder library" am: 49e2a9a612
am: 811027ede7

Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
2017-08-02 17:05:56 +00:00
Sundong Ahn
811027ede7 Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
2017-08-02 16:57:50 +00:00
Treehugger Robot
49e2a9a612 Merge "Add hwbinder library" 2017-08-02 16:46:42 +00:00
Felipe Leme
23123ece60 Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b
2017-08-02 16:09:20 +00:00
Robert Carr
132c9f5140 Inform SurfaceFlinger of which Surface is the RoundedCorners overlay.
We need to omit it from screenshots, and screen mirroring, so SurfaceFlinger
will have to have some knowledge. Eventually we'd like to do this by
having everything else have a parent, and mirroring and screenshotting will
operate on that parent. Since we aren't comfortable doing that for DR though, here's
a quick and dirty hack to tide us over with low risk.

Bug: 63311708
Test: screencap, screenrecord, android.view.cts.SurfaceViewSyncTest
Change-Id: I2b43be00567ee19cf27aeef344e5415f4a69297f
2017-08-02 09:03:05 -07: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
6f9f17475d Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e
2017-08-02 16:00:39 +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
Jeff Sharkey
d1dd2c662e Fix NPE when reading icon for removed session.
The underlying session may have been destroyed before we go back to
read out the icon.

Test: builds, boots
Bug: 63795821
Change-Id: I16eb32c74a0e3b1d0605392878d65f28437006a6
2017-08-02 15:36:12 +00:00
Felipe Leme
4e051d9da9 Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev am: 6829a1dace
am: 27eb322ed2

Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16
2017-08-02 00:35:44 +00:00
Felipe Leme
e971d933be Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev
am: 6829a1dace

Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab
2017-08-02 00:26:39 +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
TreeHugger Robot
6829a1dace Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev 2017-08-02 00:08:15 +00:00
Chad Brubaker
1ec48fc770 Add owners for the network security config
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9bb8f5ceaae4a1af8c93f5416a6a5cea42915c62
2017-08-01 15:50:22 -07:00
Andrew Solovay
517927fa1a Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: d4b1a0985b

Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4
2017-08-01 21:31:58 +00:00
Andrew Solovay
9e1b7759dc Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c
2017-08-01 21:21:58 +00:00
Andrew Solovay
d4b1a0985b Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04
2017-08-01 21:21:01 +00:00
Ruchi Kandoi
e6a08439b6 Merge "Set default value for T3T_PMM." am: 7770adf755
am: 1decea7847

Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef
2017-08-01 20:51:30 +00:00
Ruchi Kandoi
1decea7847 Merge "Set default value for T3T_PMM."
am: 7770adf755

Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc
2017-08-01 20:40:33 +00:00
Love Khanna
7d8f6ab8e1 Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897
2017-08-01 20:07:57 +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
TreeHugger Robot
756d93964d Merge "Set default value for T3T_PMM." into oc-dr1-dev 2017-08-01 19:48:12 +00:00
Love Khanna
f5d6d5c1a8 Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit 20a77e973f62f145ab7b3a4822ce34407c0ca476)
2017-08-01 17:28:09 +00:00
Love Khanna
0b5a37e876 Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
2017-08-01 17:26:21 +00:00
Andrew Solovay
494f1a4dfa docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)

See first comment for doc stage location.

Test: make ds-docs
Bug: 64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
2017-07-31 19:41:01 -07:00
Sundong Ahn
28cc6e88fd Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.

Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.

Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
2017-08-01 11:26:18 +09:00
Eino-Ville Talvala
6f1422711b Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am: 06802167e5

Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5
2017-07-31 22:30:01 +00:00
Eino-Ville Talvala
06802167e5 Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev 2017-07-31 22:21:40 +00:00
Adam Lesinski
630faa085a Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am: defdb1fd70

Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c
2017-07-31 22:17:26 +00:00
Adam Lesinski
defdb1fd70 Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev 2017-07-31 22:08:30 +00:00
Bryce Lee
05865fb40a Merge "Do not call onConfigurationChanged for appBound position changes." into oc-dr1-dev
am: 33d4702a12

Change-Id: I990a3554730cc07440c7d4bc0236e0aeb00e2980
2017-07-31 18:46:20 +00: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