Jeff Davidson
f731049f2e
am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
...
* commit '1e3977964e1cb0c14a7b3bc6f34e8f15583b93a3':
Update VpnService Javadoc to reflect new UX.
2014-09-12 07:21:49 +00:00
Prerepa Viswanadham
4d097ce830
am 041299e3: Remove onConnectionCongested callback
...
* commit '041299e377de125746800f5d4644d9fd4b793cf8':
Remove onConnectionCongested callback
2014-09-12 07:21:42 +00:00
George Mount
6316118f6f
am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
...
* commit '4041d8edb771af9a96940def096637f6d8884fb9':
Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 07:21:32 +00:00
George Mount
9a5e40fbe5
am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
...
* commit '3081e3601760871fea78d878e752b556974cb55b':
Have Activity Transitions activited by a new window attribute.
2014-09-12 07:21:28 +00:00
Igor Murashkin
95d12fe87e
am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
...
* commit '6bb75a48f2b1fac3acb10b79f9172f1bbbabc2a6':
camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 07:21:20 +00:00
Sreeram Ramachandran
bed5da12da
am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
...
* commit '8ab9b4c765b7a05223e4013f6e1d8b810a0b272c':
Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 07:21:16 +00:00
Chet Haase
0b4d935e22
am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
...
* commit '05cafed09b5dbc2642ac5a93e580ad732f5b7e8d':
Make starting window hw-accelerated
2014-09-12 07:20:34 +00:00
Paul Lawrence
046f9a6d51
am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
...
* commit '5f3e819f368f309472a8dfb6a40f733d3d8d5915':
Create correct files in dropbox on encrypted boot
2014-09-12 07:20:25 +00:00
Jeff Davidson
8afddbe7e9
Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
2014-09-11 22:41:24 +00:00
Prerepa Viswanadham
ba4f57a1c6
Remove onConnectionCongested callback
...
Bug:17289507
Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +00:00
George Mount
e6f66e78a5
Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
2014-09-11 22:08:36 +00:00
George Mount
04600023d0
Fixed: TransitionSet setStartDelay did nothing.
...
Bug 17452965
Change-Id: Id2fd6ed3bd8e7156dd3d22dcd83117cec12e3528
2014-09-11 14:59:58 -07:00
George Mount
db352c7835
Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
2014-09-11 21:54:13 +00:00
Igor Murashkin
6894f60c9c
Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
2014-09-11 21:50:34 +00:00
Jeff Davidson
6d6ea3b6be
Update VpnService Javadoc to reflect new UX.
...
The major change is that consent is now "sticky" and lasts until the
user explicitly disables the VPN connection.
Bug: 17474362
Change-Id: Id4e7807e635bbfc7645741135209d46763e280f9
2014-09-11 14:44:31 -07:00
Sreeram Ramachandran
a1e06807ee
Hide mutable VpnService APIs to add/remove IP addresses dynamically.
...
These APIs were added because we thought we needed them to provide
seamless transition from one server backend to another using local IP
addresses to distinguish between the backends. I.e., connections whose
local IP address was old would be routed to the old backend; connections
whose local IP address was new would be routed to the new backend.
It turns out that's not needed. VpnService already supports seamless
re-establishment, so VPNs just need to call establish() again with a
different IP address. I've verified with a custom VPN app that this
works, and can distinguish traffic based on the old and new addresses.
Nobody is using these APIs at the moment, so we could even consider
removing them altogether, but I prefer just hiding them, just in case.
Bug: 15409819
Change-Id: I30949926a0f859c9d839981ccbc5d8e1e535a3a5
2014-09-11 14:17:10 -07:00
Igor Murashkin
442395751d
camera2.legacy: Add aberration, noisereduction, timestamp source keys
...
Bug: 17328591
Change-Id: I037908e0db505ace1ef62d5aa0622596d8fa2713
2014-09-11 13:21:37 -07:00
Chet Haase
969e543b32
Merge "Make starting window hw-accelerated" into lmp-dev
2014-09-11 19:32:00 +00:00
Chet Haase
4f52b34206
Make starting window hw-accelerated
...
An earlier fix in L disabled hw acceleration for the starting window
after the system process became hw accelerated. This was done to preserve
the old behavior of the starting window having some default behavior
(in particular, being filled with a default color). However, this ends up
being a memory and performance problem on some platforms (memory because
some platforms have backing store for software surfaces, performance
because it takes far longer to create a screen-size software surface than
a hardware surface).
The fix is to allow the starting window to inherit the hw acceleration
behavior of its process, and to detect when we are drawing the contents
of that starting window and to fill it with a default color (black).
Issue #17443449 use hardware rendering for app preview window
Change-Id: I8be8111d9e38c51fbbc07185acca065815ce26dc
2014-09-11 12:28:29 -07:00
George Mount
9826f636ad
Have Activity Transitions activited by a new window attribute.
...
Bug 17006497
Window content transitions were being enabled by default in
the Material Theme so that Activity Transitions could be
enabled by default. Unfortunately, this gave the effect that
many applications did not want -- the default transition between
window content is a fade out/in. Here, a new attribute is
added: windowActivityTransitions that is enabled by default
in the Material theme and windowContentTransitions is disabled
by default in all themes.
Change-Id: Iab453d608f00a48ff7ab7f09ce84b52cf5f20294
2014-09-11 12:23:17 -07:00
Paul Lawrence
280813a6d9
Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
2014-09-11 19:16:15 +00:00
Paul Lawrence
91317107a3
Create correct files in dropbox on encrypted boot
...
On the minimal framework start, don't mark ro.runtime.firstboot, allowing
the real framework to properly create the dropbox files in the real /data
Bug: 17450632
Change-Id: Ic53b3471b44e69f3eea7e3f3de18e789f51192bc
2014-09-11 12:09:56 -07:00
Robin Lee
7d6af106c1
am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
...
* commit '03d82225660ebed7bd14ad9cdab300eb0c4b0d18':
Add DevicePolicyManager PrivateKey mgmt
2014-09-11 18:30:16 +00:00
Bernhard Bauer
26408ccd8e
Add DevicePolicyManager PrivateKey mgmt
...
Additional device policy API to install keypairs to the keychain
silently.
Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-11 19:17:00 +01:00
Matthew Williams
9bff6a03b3
am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
...
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
Add flag to JobParameters for job expired
2014-09-11 17:39:30 +00:00
Matthew Williams
91911fd952
Merge "Add flag to JobParameters for job expired" into lmp-dev
2014-09-11 17:27:58 +00:00
Amith Yamasani
735350449c
am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
...
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
Apply cross-user restrictions to Shell
2014-09-11 16:54:51 +00:00
Amith Yamasani
f58e532e01
Merge "Apply cross-user restrictions to Shell" into lmp-dev
2014-09-11 16:46:34 +00:00
Alexandra Gherghina
88de59f096
am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
...
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
Bugfix: use the correct user for ContentResolver calls
2014-09-11 16:21:27 +00:00
Alexandra Gherghina
ffb6343938
Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
676a422fa0
am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
...
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
Replace TreeSet with HashSet.
2014-09-11 16:11:31 +00:00
George Mount
2c563d5ffc
am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
...
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
Omit appearing views that have a parent that is also appearing.
2014-09-11 16:11:28 +00:00
Julia Reynolds
c889315c66
am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
...
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
Allow device owners to update LOCATION_MODE.
2014-09-11 16:02:45 +00:00
Alexandra Gherghina
557186b0ac
am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
...
* commit 'b04106ed46919030b944b02a8a227f8fe343c5a5':
Remove package level intent forwarding.
2014-09-11 16:02:15 +00:00
Paul Jensen
36ef999b11
am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
...
* commit 'c1dad5c2e953535f61a6438a13cee40088786d58':
Flush HTTP socket pools and DNS cache when binding process to a Network.
2014-09-11 16:01:59 +00:00
Paul Jensen
db5a70b82f
am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
...
* commit '7f1343eec6a94092236044381b92d8085605ee4f':
Make Network.openConnection() share HttpHandlers not OkHttpClients.
2014-09-11 16:01:55 +00:00
Alan Viverette
63eb94ae73
am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
...
* commit '515699a4a0235d8cd39fd586067e9d2857e6bda4':
Use Calendar day of week rather than Time in SimpleMonthView
2014-09-11 15:59:37 +00:00
Przemyslaw Szczepaniak
6931cc9f41
Merge "Replace TreeSet with HashSet." into lmp-dev
2014-09-11 15:59:36 +00:00
Svetoslav Ganov
47f09dc91c
am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
...
* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
Using the correct package name for ContentResolver
2014-09-11 15:59:34 +00:00
Dianne Hackborn
a104fb92c0
am 022cfcda: Merge "Fix issue #17414533 : update batterystats occasionally takes a couple..." into lmp-dev
...
* commit '022cfcda265079cc694079db43bd58efcbd4958a':
Fix issue #17414533 : update batterystats occasionally takes a couple...
2014-09-11 15:59:23 +00:00
Dianne Hackborn
35fc269dc6
am b4ee4428: Merge "Fix issue #17428001 : Fix revokeUriPermissions" into lmp-dev
...
* commit 'b4ee4428d34002aea54e9dc62902f14dedf69604':
Fix issue #17428001 : Fix revokeUriPermissions
2014-09-11 15:59:19 +00:00
Lajos Molnar
b8f6ebf028
am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
...
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
add android.util.SizeF.parseSizeF()
2014-09-11 15:59:15 +00:00
Alan Viverette
d509a2dfa6
am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
...
* commit '78f863c7c00948817ede61ec59e47c990009b00d':
Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-11 15:58:35 +00:00
Alan Viverette
cdd5221105
am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
...
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
Make SearchView styles public, remove public Holo styles added in L
2014-09-11 15:58:27 +00:00
Przemyslaw Szczepaniak
3786bc5498
Replace TreeSet with HashSet.
...
Both Locale and Voice do not implement Comparable.
Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8
Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
2014-09-11 15:53:36 +00:00
Julia Reynolds
d86734b469
Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
2014-09-11 15:46:07 +00:00
Alexandra Gherghina
02b6addb53
Merge "Remove package level intent forwarding." into lmp-dev
2014-09-11 15:17:21 +00:00
Adam Connors
e107c3eb79
Remove package level intent forwarding.
...
Clean up unused methods.
Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
2014-09-11 15:42:13 +01:00
Paul Jensen
204dc65f37
Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
2014-09-11 13:15:22 +00:00