Miao Wang
4bd2c00d8d
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc
...
automerge: 58fd96c
* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
2015-02-05 00:27:49 +00:00
Miao Wang
58fd96c607
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"
...
automerge: 9a55cbc
* commit '9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
2015-02-05 00:07:17 +00:00
Miao Wang
9a55cbc052
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"
2015-02-05 00:03:05 +00:00
John Reck
c7e6b93aba
am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4
...
* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
Fix ANR caused by hwuiTask thread
2015-02-04 22:08:27 +00:00
John Reck
af6eaf656e
Merge "Fix ANR caused by hwuiTask thread"
...
automerge: 5ad36d4
* commit '5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
Fix ANR caused by hwuiTask thread
2015-02-04 21:58:39 +00:00
John Reck
5ad36d4591
Merge "Fix ANR caused by hwuiTask thread"
2015-02-04 21:53:48 +00:00
Elliott Hughes
4c49b1fb77
am b2d7ca7c: am fd2c1307: Merge "Fix build."
...
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
Fix build.
2015-02-04 20:37:59 +00:00
Elliott Hughes
b2d7ca7c6f
am fd2c1307: Merge "Fix build."
...
* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
Fix build.
2015-02-04 20:31:45 +00:00
Elliott Hughes
fd2c1307e6
Merge "Fix build."
2015-02-04 20:26:03 +00:00
Elliott Hughes
f953ca2ec8
Fix build.
...
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
2015-02-04 12:24:21 -08:00
Christopher Ferris
9d25fcae85
am 4fb79d14: Merge "Fix comment according to review."
...
automerge: ff6cebf
* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
Fix comment according to review.
2015-02-04 19:29:56 +00:00
Christopher Ferris
ff6cebf0a6
am 4fb79d14: Merge "Fix comment according to review."
...
* commit '4fb79d14bb6c81f72a92da85420090a05ec2c76d':
Fix comment according to review.
2015-02-04 19:15:47 +00:00
Christopher Ferris
4fb79d14bb
Merge "Fix comment according to review."
2015-02-04 19:07:15 +00:00
Christopher Ferris
7254c123a1
Fix comment according to review.
...
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
2015-02-04 10:40:12 -08:00
Geoff Mendal
8911c2aeb1
Import translations. DO NOT MERGE
...
automerge: 140a22d -s ours
* commit '140a22de8ead0f166eaea320a37b7134f265353e':
Import translations. DO NOT MERGE
2015-02-04 14:40:51 +00:00
Geoff Mendal
140a22de8e
Import translations. DO NOT MERGE
...
Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import
2015-02-04 06:28:45 -08:00
Miao Wang
f0f6e80bae
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT
...
(Native RS)
Change-Id: I23041da03c2c928ceec76037804abb5dc7e6eb64
2015-02-03 17:16:43 -08:00
Wonsik Kim
b86a45588a
am 015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd
...
* commit '015fdf392388f1bed3298f9f44012c1a82d7c1a1':
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
2015-02-03 23:52:42 +00:00
Wonsik Kim
015fdf3923
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
...
automerge: d7310bd
* commit 'd7310bd1499c0b48594a8fbbcbe0c7e80c1e5832':
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
2015-02-03 23:44:34 +00:00
Wonsik Kim
d7310bd149
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
2015-02-03 23:39:59 +00:00
Lajos Molnar
d8e6a8b764
am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
...
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
camera2: limit flexYUV array size in DngCreator
2015-02-03 23:23:11 +00:00
Lajos Molnar
6999ef3488
camera2: limit flexYUV array size in DngCreator
...
automerge: fdb2112
* commit 'fdb2112bbc140aab869aac047454cd2f67809df1':
camera2: limit flexYUV array size in DngCreator
2015-02-03 23:16:28 +00:00
Lajos Molnar
fdb2112bbc
camera2: limit flexYUV array size in DngCreator
...
corrected overread
Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
2015-02-03 14:57:09 -08:00
Paul Jensen
b35275a25e
am f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge: 39ae054
...
* commit 'f1b78d046965f91c2e03d541cba4c91ea707111a':
Facilitate network validation on networks with a per-network PAC.
2015-02-03 21:17:09 +00:00
Paul Jensen
f1b78d0469
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
...
automerge: 39ae054
* commit '39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
Facilitate network validation on networks with a per-network PAC.
2015-02-03 21:11:51 +00:00
Paul Jensen
39ae0547ca
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
2015-02-03 21:08:59 +00:00
Craig Mautner
e8bd6d734c
Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f
...
automerge: 6112f63
* commit '6112f63369c7ba463c0384c73a4e4c0d45b63918':
[ActivityManager] Prevent application holding AMS lock
2015-02-03 18:48:29 +00:00
Craig Mautner
6112f63369
Merge "[ActivityManager] Prevent application holding AMS lock"
...
automerge: 53e8d6f
* commit '53e8d6f934be403b9c7733c190b6052d60dd0658':
[ActivityManager] Prevent application holding AMS lock
2015-02-03 18:43:46 +00:00
Craig Mautner
53e8d6f934
Merge "[ActivityManager] Prevent application holding AMS lock"
2015-02-03 18:41:14 +00:00
Craig Mautner
c0e9c1d0a4
am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
...
automerge: 7d1aded
* commit '7d1adede2fbea8f4c0ad92214bee16395498dd07':
[ActivityManager] Set appropriate relation of task to home
2015-02-03 18:04:32 +00:00
Craig Mautner
7d1adede2f
am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home"
...
* commit '240e8743977d1a1e7a43ff42e0d52148db10cda8':
[ActivityManager] Set appropriate relation of task to home
2015-02-03 18:00:46 +00:00
Craig Mautner
240e874397
Merge "[ActivityManager] Set appropriate relation of task to home"
2015-02-03 17:54:27 +00:00
Craig Mautner
cd1b1ee39f
Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: 84533ed
...
automerge: 11c6f8b
* commit '11c6f8b7c3cc51a3a44bca5003ac3fb56a410c33':
Remove fall through for KEYCODE_VOICE_ASSIST
2015-02-03 17:46:56 +00:00
Craig Mautner
11c6f8b7c3
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
...
automerge: 84533ed
* commit '84533edfc081f8dfa632ee1e49947b3d42f8a27d':
Remove fall through for KEYCODE_VOICE_ASSIST
2015-02-03 17:41:31 +00:00
Craig Mautner
84533edfc0
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"
2015-02-03 17:36:54 +00:00
Robert Greenwalt
74033e9d8f
am 10d1609b: am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
...
* commit '10d1609be9bd842f9a3ee44d9753a55e6e19cbd8':
Deutsche Telekom VVM free SMS shortcodes DE
2015-02-03 16:53:49 +00:00
Robert Greenwalt
10d1609be9
am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE"
...
* commit 'deef702e60f2f0aa9cf35a70bdf4c5e582799750':
Deutsche Telekom VVM free SMS shortcodes DE
2015-02-03 16:47:34 +00:00
Robert Greenwalt
deef702e60
Merge "Deutsche Telekom VVM free SMS shortcodes DE"
2015-02-03 16:44:02 +00:00
Paul Jensen
8fe1742946
Facilitate network validation on networks with a per-network PAC.
...
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY. This will fail on networks where Internet
access is only permitted via the proxy. Always failing network
validation has the potential to disable WiFi auto-join. Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.
bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
2015-02-03 11:28:55 -05:00
Henrik Baard
aa5c5e31de
Remove fall through for KEYCODE_VOICE_ASSIST
...
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.
The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.
Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
2015-02-03 09:25:28 +01:00
Svetoslav
f8acd7a961
Fix broken activation of the selected view in accessibility mode. automerge: ded133c
...
automerge: b6b526e
* commit 'b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
Fix broken activation of the selected view in accessibility mode.
2015-02-03 07:27:33 +00:00
Svetoslav
b6b526eaaf
Fix broken activation of the selected view in accessibility mode.
...
automerge: ded133c
* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
Fix broken activation of the selected view in accessibility mode.
2015-02-03 07:20:34 +00:00
Yang Ni
712e38eaba
Merge "Pass in code cache directory when creating a script group." automerge: 9559ce7
...
automerge: 29fe5ef
* commit '29fe5ef179a4a7de15360650353c6196f9350b07':
Pass in code cache directory when creating a script group.
2015-02-03 06:27:39 +00:00
Yang Ni
29fe5ef179
Merge "Pass in code cache directory when creating a script group."
...
automerge: 9559ce7
* commit '9559ce7c1bd4451a470d6e1542659e726b0dce3d':
Pass in code cache directory when creating a script group.
2015-02-03 06:22:55 +00:00
Yang Ni
9559ce7c1b
Merge "Pass in code cache directory when creating a script group."
2015-02-03 06:20:20 +00:00
Svetoslav
ded133c446
Fix broken activation of the selected view in accessibility mode.
...
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.
This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.
The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.
bug:18986806
bug:18889611
Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
2015-02-02 23:17:17 +00:00
Joe Fernandez
e9557d7d27
am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860
...
automerge: d99924d
* commit 'd99924d556b95bc05bbff9408519e301983193fb':
docs: February 2015 Dashboard updates
2015-02-02 20:29:31 +00:00
Joe Fernandez
d99924d556
am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860
...
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
docs: February 2015 Dashboard updates
2015-02-02 19:35:00 +00:00
Jorim Jaggi
83eaf6cc8c
am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
...
automerge: 2ffb340
* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
Send accessibility event when bouncer is shown
2015-02-02 19:30:34 +00:00
Jorim Jaggi
2ffb3400f7
am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
...
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
Send accessibility event when bouncer is shown
2015-02-02 19:25:34 +00:00