George Mount
fbad078408
am b08f41d1: am d5b03769: am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
...
* commit 'b08f41d11df044a55a496576f6ccd088c24fae08':
Fix Visibility transitions canceling when nothing has changed.
2014-11-18 20:20:45 +00:00
Griff Hazen
20f9280bd5
am e394c1d1: am 89f02249: am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping
...
* commit 'e394c1d108499885599b046521c69d915c8f5a8f':
Improve doc for {get,set}HintAvoidBackgroundClipping
2014-11-18 20:19:03 +00:00
George Mount
b08f41d11d
am d5b03769: am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
...
* commit 'd5b03769767522e6c02587269a39eeb030e09672':
Fix Visibility transitions canceling when nothing has changed.
2014-11-18 15:36:49 +00:00
George Mount
d5b0376976
am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
...
* commit '6cb51968c205e84d6ba730d73c3aaf00ccf8c649':
Fix Visibility transitions canceling when nothing has changed.
2014-11-18 15:32:53 +00:00
George Mount
6cb51968c2
Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
2014-11-18 15:29:48 +00:00
Andres Morales
1fdb441d43
am 046c7b2d: am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev
...
* commit '046c7b2d553fb59f3520073380fce89cfa960e2d':
Add UserHandle to BeamShareData
2014-11-18 02:31:22 +00:00
Jeff Davidson
19222147fc
am 704b7521: am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.
...
* commit '704b7521b19d654c49c7804e6079aec3f2c69838':
Expose a SystemApi method to prepare a VPN without consent.
2014-11-18 02:31:02 +00:00
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
Christopher Tate
889de0b459
am f75301f7: am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev
...
* commit 'f75301f7b1c75207824fd7d9aab0f5936cb6e3ed':
Don't crash just because invalid datasets were offered for restore
2014-11-17 21:09:58 +00:00
Christopher Tate
f75301f7b1
am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev
...
* commit '93fb155344e076d7ac2dfc5570c8d560c206ae0e':
Don't crash just because invalid datasets were offered for restore
2014-11-17 21:05:10 +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
Christopher Tate
93fb155344
am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev
...
* commit '94d963381d7bd75e60da1c3038c7970e47d2ac35':
Don't crash just because invalid datasets were offered for restore
2014-11-17 20:59:46 +00:00
Christopher Tate
94d963381d
Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev
2014-11-17 20:20:12 +00:00
Eino-Ville Talvala
3a5b2b69c9
am 9c26cebc: am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev
...
* commit '9c26cebc887c9b5e2211702a25d4c60481899013':
Camera2: Add BURST_CAPTURE capability flag
2014-11-17 19:37:25 +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
Ying Wang
affbaee9c1
am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp
...
* commit 'c2045047735522f50bc1d2618280bd37306f18d2':
Move preloaded-classes out of framework.jar.
2014-11-17 19:24:11 +00:00
Ying Wang
c204504773
resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp
...
Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191
2014-11-17 10:56:26 -08: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
bad677f3c2
Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev
2014-11-17 18:27:37 +00:00
Ying Wang
5c7bc93127
am 867a0de0: Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev
...
* commit '867a0de0b4632984b7a73ee3489e4d1f66c19dd7':
Move preloaded-classes out of framework.jar.
2014-11-17 18:24:32 +00:00
Ying Wang
867a0de0b4
Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev
2014-11-17 18:14:06 +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
4ae37f9052
am 9f722068: am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev
...
* commit '9f722068483239516d0d31841d1deb189d01b5c1':
Prevent user ID reuse until after reboot.
Warn user when build fingerprints differ.
2014-11-17 17:44:28 +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
17762bb9c7
am 64b5e00a: am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
...
* commit '64b5e00aaa53dbca59e8b997184bf479f68915eb':
Wire up surface width/height to lockHardwareCanvas
2014-11-17 15:31:12 +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
Ying Wang
0de36e51c5
Move preloaded-classes out of framework.jar.
...
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
2014-11-17 10:15:39 +00:00
Tom Turney
dfd827e424
am e9f8d1dd: 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 advertisem
...
* commit 'e9f8d1ddbdfe6bf9d4b4a9cb1fca8703febff742':
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:38:12 +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
Jeff Brown
43dc963a43
am eadefb25: am bba231d7: Explicitly bind AsyncTask to main looper. automerge: dfe7d21
...
* commit 'eadefb255a2bda602ccc043531a231413e8ea839':
Explicitly bind AsyncTask to main looper.
2014-11-15 03:09:44 +00:00
Ruben Brunk
82b9f663ec
am 60af60c4: am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev automerge: 73a7f28
...
* commit '60af60c4b04b992f5a9e6a8f613b6b802276552a':
camera2: Add READ_SETTINGS capability.
2014-11-15 03:09:39 +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
Christopher Tate
824392bdbd
Don't crash just because invalid datasets were offered for restore
...
In practice, recognize that the current transport state may not yet
incorporate a valid restore data stream object, so don't go making
assumptions that it's usable / closeable / etc.
Bug 18379004
Change-Id: I221e04b5b83438e37455e025d67f412d3abb8c50
2014-11-14 18:27:36 -08: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
