Griff Hazen
e394c1d108
am 89f02249: am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping
...
* commit '89f02249970dc3058e1b38402f1fb64c614bafad':
Improve doc for {get,set}HintAvoidBackgroundClipping
2014-11-18 02:27:23 +00:00
Andres Morales
046c7b2d55
am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev
...
* commit 'e261ede827664bdb0f115edb5af25e590a36557e':
Add UserHandle to BeamShareData
2014-11-18 02:05:51 +00:00
Jeff Davidson
704b7521b1
am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.
...
* commit '0e7848748256f4b5709a4c94882e20d96a86ae8e':
Expose a SystemApi method to prepare a VPN without consent.
2014-11-18 02:05:29 +00:00
Griff Hazen
89f0224997
am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping
...
* commit '9c5be4eddd1607846c189e403fd74fd288ce7976':
Improve doc for {get,set}HintAvoidBackgroundClipping
2014-11-18 01:56:57 +00:00
Griff Hazen
9c5be4eddd
Improve doc for {get,set}HintAvoidBackgroundClipping
...
Bug: 18414403
Change-Id: I4cc069ca8f13d7521aa94e3c18f776de69280e2f
2014-11-17 17:47:50 -08:00
Andres Morales
e261ede827
am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev
...
* commit '5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd':
Add UserHandle to BeamShareData
2014-11-17 22:58:40 +00:00
Jeff Davidson
0e78487482
am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.
...
* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
Expose a SystemApi method to prepare a VPN without consent.
2014-11-17 22:58:12 +00:00
Andres Morales
5aadd5b6fa
Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev
2014-11-17 21:53:58 +00:00
Jeff Davidson
9a1da68bf7
Expose a SystemApi method to prepare a VPN without consent.
...
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.
The API requires a system-privileged permission, CONTROL_VPN.
Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
2014-11-17 21:03:10 +00:00
Eino-Ville Talvala
9c26cebc88
am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev
...
* commit '438f54dbbbcfeac24fcf5eb52bede69ad2fc02a0':
Camera2: Add BURST_CAPTURE capability flag
2014-11-17 19:31:50 +00:00
Eino-Ville Talvala
438f54dbbb
am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev
...
* commit 'bad677f3c2230612acbabf6c7233d9a3f24a7dc3':
Camera2: Add BURST_CAPTURE capability flag
2014-11-17 18:37:02 +00:00
Eino-Ville Talvala
126a7468c2
Camera2: Add BURST_CAPTURE capability flag
...
This capability (a subset of FULL) indicates that a camera device
can capture high-rate (>= 20fps) bursts of images at full device
resolution, in at least the YUV_420_888 format.
It also guarantees that the synchronization latency for a device is
relatively small, so that fixed-setting bursts can be captured quickly.
Bug: 18281970
Change-Id: Ifc8fc43252a77097d804429d1c9f6fa71a95aa4f
2014-11-17 17:50:05 +00:00
Jeff Sharkey
9f72206848
am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
...
* commit 'ecfd372ae4fc69c10de83c6499c0c0e4379debc8':
Prevent user ID reuse until after reboot.
Warn user when build fingerprints differ.
2014-11-17 17:39:16 +00:00
Jeff Sharkey
ecfd372ae4
am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
...
* commit '9c76a7b3e85ce7056071ac8627c8d675cc5c1599':
Prevent user ID reuse until after reboot.
Warn user when build fingerprints differ.
2014-11-17 17:32:31 +00:00
Jeff Sharkey
9c76a7b3e8
Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
...
* changes:
Prevent user ID reuse until after reboot.
Warn user when build fingerprints differ.
2014-11-17 17:28:54 +00:00
John Reck
64b5e00aaa
am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:27:43 +00:00
John Reck
ff5978988a
am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit 'b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:23:11 +00:00
John Reck
b3ec64e100
Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
2014-11-17 15:19:23 +00:00
Tom Turney
e9f8d1ddbd
am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement\'s adverti
...
automerge: fa90087
2014-11-15 03:33:04 +00:00
Tom Turney
fa90087274
am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement\'s adverti
...
* commit '2a46722f96480aed028785e955cbb8cb506df0b2':
Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
2014-11-15 03:07:29 +00:00
Jeff Brown
eadefb255a
am bba231d7: Explicitly bind AsyncTask to main looper.
...
automerge: dfe7d21
2014-11-15 02:47:56 +00:00
Ruben Brunk
60af60c4b0
am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
...
automerge: 73a7f28
2014-11-15 02:46:45 +00:00
Tom Turney
29230ceab9
Feature request: Increasing advertise data size on
...
non-connectable adv.
When the advertisement is non-connectable, give back the
bytes to the advertiser where the adv flags would have been.
This increases the non-connectable advertisement's advertise
data from 24 to 27 bytes.
Bug:18359570
Change-Id: Ia3cc48dca50cc3c51095ee92a489f143f6d350b1
2014-11-15 02:25:05 +00:00
Jeff Brown
dfe7d2193c
am bba231d7: Explicitly bind AsyncTask to main looper.
...
* commit 'bba231d7a63b58a8c2b174722ed1487b0f7d8270':
Explicitly bind AsyncTask to main looper.
2014-11-15 01:38:48 +00:00
Ruben Brunk
73a7f2862c
am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
...
* commit '4d2d97763f0963d7011d04290dc87b2940aefb33':
camera2: Add READ_SETTINGS capability.
2014-11-15 01:25:09 +00:00
Jeff Brown
bba231d7a6
Explicitly bind AsyncTask to main looper.
...
It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable. In particular, this resulted in occasional system
server crashes.
Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
2014-11-14 17:22:31 -08:00
Ruben Brunk
4d2d97763f
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
2014-11-15 01:13:54 +00:00
John Reck
ff0c4856f4
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
automerge: f1812b1
2014-11-14 22:58:50 +00:00
Yuncheol Heo
376dee63f3
am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
...
automerge: cde2617
2014-11-14 22:57:33 +00:00
Jeff Sharkey
2cffc7dafd
Warn user when build fingerprints differ.
...
We're now shipping devices with several partitions which may end up
mismatched, causing subtle runtime issues. To help manufacturers and
users catch this case, show wanring when we detected mismatched
fingerprints.
Bug: 18357469
Change-Id: I897d7ee8cbf3b8042d3d7d282afab277d242ed3f
2014-11-14 14:28:06 -08:00
John Reck
f1812b17bb
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
* commit '8f5839be21f028885b6171e75cba479a020a3a0c':
Document that circular reveal is async
2014-11-14 22:07:29 +00:00
John Reck
8f5839be21
Merge "Document that circular reveal is async" into lmp-mr1-dev
2014-11-14 22:03:33 +00:00
John Reck
a3b35907de
Document that circular reveal is async
...
Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
2014-11-14 14:02:55 -08:00
Yuncheol Heo
cde261796b
am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
...
* commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590':
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
2014-11-14 21:55:43 +00:00
Raph Levien
7010d0b6c3
am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
...
automerge: 58fa003
2014-11-14 21:53:11 +00:00
Raph Levien
c047ca4540
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
automerge: fbe0e8f
2014-11-14 21:51:44 +00:00
Raph Levien
2d20850525
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
automerge: be1ad50
2014-11-14 21:50:37 +00:00
Yuncheol Heo
8977c1dab5
Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
2014-11-14 21:50:21 +00:00
Jeff Sharkey
b536c7a693
am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
...
automerge: 47d2c97
2014-11-14 21:47:17 +00:00
Yin-Chia Yeh
19e1512dca
am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
...
automerge: 46810bf
2014-11-14 21:42:45 +00:00
Raph Levien
58fa003577
am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
...
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
Check bounds on CharSequence drawText methods
2014-11-14 20:56:46 +00:00
Raph Levien
fbe0e8f418
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
Update hint text color even when text present
2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
Fudge clipRect in TextView for extra cursor width
2014-11-14 20:56:35 +00:00
Raph Levien
505ffe3633
Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
2014-11-14 20:54:29 +00:00
Raph Levien
25f7c4b992
Merge "Update hint text color even when text present" into lmp-mr1-dev
2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded
Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
2014-11-14 20:51:58 +00:00
Jeff Sharkey
47d2c97e70
am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
...
* commit '27936ad3a677509fab1174c7b6655c894f018143':
Block loading WebView in privileged processes.
2014-11-14 19:33:49 +00:00
Jeff Sharkey
27936ad3a6
Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
2014-11-14 19:24:53 +00:00
Yin-Chia Yeh
46810bf200
am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
...
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
Camera: doc update for independent 3A
2014-11-14 19:06:37 +00:00
Jeff Sharkey
85844916b8
Block loading WebView in privileged processes.
...
WebView is very powerful, but it also has a large attack area. To
improve security, refuse to load WebView components when running as
the root or system UIDs.
Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
2014-11-14 11:02:27 -08:00
