Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,332 Commits 3 Branches 0 Tags
f20d09c17f95e41c9110bc40fb05abf5c7be9937
Commit Graph

40794 Commits

Author SHA1 Message Date
Craig Mautner
f20d09c17f am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2c85b1fcebdf08601124eada828da553a8d9f820':
  If activity is an alias get maxRecents from target
 2014-09-12 05:45:32 +00:00
Jeff Davidson
85e36549ae am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit 'bf2ac88fc4bceb56db27bfd3aa1483216648468f':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 05:45:26 +00:00
Prerepa Viswanadham
7af08c0547 am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit '0d8efe53e1d3d5eefd48b608416b8ac2a02e7fba':
  Remove onConnectionCongested callback
 2014-09-12 05:45:13 +00:00
George Mount
189a460a34 am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'b9a2399e205f231f07176063854a8410a7fec1c1':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 05:44:57 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 05:44:51 +00:00
Igor Murashkin
5e03d27960 am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '5d2587c3ff59ac30b411f5b0d593707289ffc0aa':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 05:44:41 +00:00
Sreeram Ramachandran
ea949c3002 am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '6e06689c6dc38e57b83d73d22245fffe1b5065c4':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 05:44:36 +00:00
Chet Haase
dcce4a5119 am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit 'e58831a6a0edce3114686cb8168652a50e956031':
  Make starting window hw-accelerated
 2014-09-12 05:43:45 +00:00
Craig Mautner
3969cabf59 Merge "If activity is an alias get maxRecents from target" into lmp-dev 2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c If activity is an alias get maxRecents from target 
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.

Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).

Fixes bug 17391328.

Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
 2014-09-11 15:53:44 -07: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
Robin Lee
ebf185a591 am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit 'ac988bd9e45c5588cfffc6e67d04e54b86ecd519':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-11 18:39:54 +00:00
Matthew Williams
146eccccbd am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
  Add flag to JobParameters for job expired
 2014-09-11 18:32:08 +00:00
Amith Yamasani
5f0439d729 am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '3b18a0c5f8efdb915fb1304c959236d608eb8b79':
  Apply cross-user restrictions to Shell
 2014-09-11 18:31:06 +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
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +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
802669e7f8 am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '3507cc0f8474d28b834fd4382397975478c63725':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:31:57 +00:00
Przemyslaw Szczepaniak
25183677ef am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit '817dbc8c2aa437388617238e3fb6c4dc6ecf5849':
  Replace TreeSet with HashSet.
 2014-09-11 16:16:24 +00:00
George Mount
6929f050ef am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '6a6c4eed6b1bf7f3a00b28b41d984d0113377b76':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:16:20 +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
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +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
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
 2014-09-11 15:36:21 +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
da7835d5c3 am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '576fc3ca6bdd5ffe606d3e36f6b8114530642d3e':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-11 13:34:08 +00:00
Paul Jensen
f4f38caa29 am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '09ff9d7e9823accbee65f3e44be13e8e7d9d5842':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-11 13:17:47 +00: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
Paul Jensen
5236971bbf Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 2014-09-11 12:57:33 +00:00
Alan Viverette
bc57a08f5f am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '5f9ce5e98322d328e6b0628875f73aa688a71c9e':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 01:57:20 +00:00
Svetoslav Ganov
4165e500f6 am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit 'b6e7e347c15db664411aa6d369314ae396d4c65b':
  Using the correct package name for ContentResolver
 2014-09-11 01:57:14 +00:00
Alan Viverette
0c1964e76d Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 2014-09-11 01:22:55 +00:00
Svetoslav Ganov
b1467faa23 Merge "Using the correct package name for ContentResolver" into lmp-dev 2014-09-11 01:21:21 +00:00
Dianne Hackborn
24d8c17bdb am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit 'f6f453d1baa77d3bed97936ffbe177d15055c8e8':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 01:18:09 +00:00
Lajos Molnar
40449c70d6 am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit 'b9414beb66ef9ca14bc606256f3af781c8124901':
  add android.util.SizeF.parseSizeF()
 2014-09-11 01:18:01 +00:00