Commit Graph

41463 Commits

Author SHA1 Message Date
Igor Murashkin
41882cd269 am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit 'c819ec1beee0d69ee956e77a57523596d17e3eb3':
  camera2: Increase preview frame timeout
2014-09-24 22:54:24 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
2014-09-24 15:47:36 -07:00
Igor Murashkin
fc4cba3619 am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
  camera2: Increase preview frame timeout
2014-09-24 22:27:36 +00:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge"
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
2014-09-24 22:10:15 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
Igor Murashkin
c4b7919882 am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev
* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
  camera2: Increase preview frame timeout
2014-09-24 21:07:24 +00:00
Igor Murashkin
1dbf7248ea Merge "camera2: Increase preview frame timeout" into lmp-dev 2014-09-24 20:58:18 +00:00
Igor Murashkin
3e2c14f3d6 camera2: Increase preview frame timeout
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.

Increase the timeout to make it significantly less likely to get frame drops.

Bug: 17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
2014-09-24 13:53:40 -07:00
George Mount
da083bfd03 am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element.
* commit '028332e93e885d260c6214ca14e02035242c8dfe':
  Fix NPE when detached View is added as a shared element.
2014-09-24 20:49:33 +00:00
George Mount
c9a5227292 Fix NPE when detached View is added as a shared element.
Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
2014-09-24 12:39:08 -07:00
Svetoslav
5948a3c967 am 0444464b: am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
* commit '0444464b18cd9dcb070e5a5e12192a000b07b0a4':
  Ignore not visible  views computing click point for accessibility.
2014-09-24 16:20:45 +00:00
Zoltan Szatmary-Ban
f168023d82 am 5ba8cb8a: am 209c42d1: am eae7e276: am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
* commit '5ba8cb8aaafd3ffc8686687eee411f5f7b4e377f':
  Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 16:20:17 +00:00
Svetoslav
a9f6486c92 am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
* commit '176b19559e3775e59ce852fa54343bea5663ee17':
  Ignore not visible  views computing click point for accessibility.
2014-09-24 15:33:51 +00:00
Svetoslav
856fcb6284 Merge "Ignore not visible views computing click point for accessibility." into lmp-dev 2014-09-24 15:24:00 +00:00
Zoltan Szatmary-Ban
d2a77c2453 am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
* commit '7602bc548c3c85e8958e899593cc1757d849d532':
  Register ActivityManagerService.PackageMonitor for all users.
2014-09-24 09:52:22 +00:00
Zoltan Szatmary-Ban
bdc07b6986 Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev 2014-09-24 09:41:19 +00:00
Lorenzo Colitti
542fc7be49 am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '19733a32c87d0597448318ac1665450aed03ba69':
  Block address families with routes, not NetworkAgent side channel
2014-09-24 04:13:50 +00:00
Jeff Sharkey
93b178d90e am bb44d63b: am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit 'bb44d63be156a24cad4e3ed81500efdc7fe4ca31':
  More ACTION_CHOOSER ClipData migration.
2014-09-24 04:13:32 +00:00
Svetoslav
e7482460af Ignore not visible views computing click point for accessibility.
In accessibility mode we compute a location to where to send down and up
events to click a view (triggered by a double tap). This solves the problem
of interacting with views that are partially covered by other interactive
views. The logic that computes the click point was not ignoring siblings
that are not visible. As a result a blind user cannot interact with some
views.

bug:17632224

Change-Id: I93e637ee6702e4ba3e79faa736205430e2196d01
2014-09-23 18:48:28 -07:00
Lorenzo Colitti
34feaa0947 am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
  Block address families with routes, not NetworkAgent side channel
2014-09-24 01:29:36 +00:00
Lorenzo Colitti
e034716628 Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev 2014-09-24 01:21:06 +00:00
Jeff Sharkey
5c1ac3d443 am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
  More ACTION_CHOOSER ClipData migration.
2014-09-24 00:05:53 +00:00
Jeff Sharkey
fb488eb2a2 Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev 2014-09-23 23:58:51 +00:00
Jeff Sharkey
c004eef7bb More ACTION_CHOOSER ClipData migration.
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData.  Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent.  Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.

Bug: 17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
2014-09-23 16:40:53 -07:00
Igor Murashkin
00282c876e am 900d0072: am bda40b57: am e3ad6ff8: am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit '900d0072197ece4375f86e2e49d86b7e1c0821d2':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 23:29:59 +00:00
Igor Murashkin
a040e44417 am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit 'c79b145f0216d2f9b099a409fee2c154de1f7019':
  camera2-legacy: Workaround max jpeg/preview size AR mismatch
2014-09-23 22:59:56 +00:00
Igor Murashkin
4f17981fdc Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev 2014-09-23 22:50:30 +00:00
Igor Murashkin
a0496d34ff camera2-legacy: Workaround max jpeg/preview size AR mismatch
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.

Bug: 17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
2014-09-23 15:11:36 -07:00
Adam Powell
bbceeffebe am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit '7c673645310530dc22ee99719f3538dabbd69a02':
  Track persistent nested Y offset for fling velocity
2014-09-23 21:30:55 +00:00
Adam Powell
6c0b8b794a am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
  Track persistent nested Y offset for fling velocity
2014-09-23 20:55:35 +00:00
Adam Powell
01db31f899 Merge "Track persistent nested Y offset for fling velocity" into lmp-dev 2014-09-23 20:46:47 +00:00
Ruben Brunk
53f6963d73 am fba543e3: am b38a6f80: am 56bd6a6b: am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit 'fba543e3d7afce12bc656d53e836fd61d520f05e':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:51:19 +00:00
Ruben Brunk
6a90fa0c20 am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '30306d89bd83fe884b11816f5cfc33d5ab3048cb':
  camera2: Update EACCES to throw correct exception in LEGACY.
2014-09-23 18:16:39 +00:00
Ruben Brunk
b0ddd2e0d6 Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev 2014-09-23 18:08:42 +00:00
Ruben Brunk
3084c2f519 camera2: Update EACCES to throw correct exception in LEGACY.
Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
2014-09-23 10:32:18 -07:00
Jeff Brown
578628741b am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a':
  Fix window manager policy state when waking from doze.
2014-09-23 17:23:04 +00:00
Jeff Brown
651def483c am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
  Fix window manager policy state when waking from doze.
2014-09-23 16:48:43 +00:00
Jeff Brown
55fa020713 Merge "Fix window manager policy state when waking from doze." into lmp-dev 2014-09-23 16:42:52 +00:00
Jeff Brown
3ee549ca24 Fix window manager policy state when waking from doze.
Once upon a time when the world was fresh and new, the heavens
had an easy rhythm.  Day and night.  Night and day.  In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom.  In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream.  At first
the dream was peaceful, full of colors and delight, hopes and
memories.  Then all at once, jarringly, it awoke in bright
daylight.  The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep.  It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness.  The fairy despaired.  It wanted no
part of this place.  It pretended for a time to be awake but
the bright daylight would not come.  It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion.  Then just as
suddenly, it awoke in the daylight.  It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same.  For the night is dark and full
of terrors.

---

It used to be easy.  Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display.  We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff).  Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues.  Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere.  Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now.  Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
2014-09-23 09:38:05 -07:00
Zoltan Szatmary-Ban
0bec95d052 Register ActivityManagerService.PackageMonitor for all users.
With the introduction of managed profiles, ActivityManagerService.PackageMonitor
can receive Intents from users other than current one.

Bug: 17580914, 17314317
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
2014-09-23 17:27:17 +01:00
George Mount
9296bcc75f am 27b46d35: am a17365ef: am d0f0f86b: am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit '27b46d350dcd89efde25dc1e0bae35156a6c1346':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 15:53:42 +00:00
Lorenzo Colitti
11ebb69d50 am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev
* commit 'd0d59156e69d9f33eea68e783b2835867bdaa67f':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
2014-09-23 15:51:32 +00:00
Ruben Brunk
0498c04857 am 04ddd954: am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev
* commit '04ddd954e3ccad653441762d1f289b2945dc061e':
  camera2: Docs update for available AF modes.
2014-09-23 15:50:33 +00:00
Ruben Brunk
79a7e78c0d am b95f6de6: am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev
* commit 'b95f6de6a4b23b7e95c61446f4879dbedf444156':
  camera2: Add missing whitebalance mapping.
2014-09-23 15:50:27 +00:00
Alan Viverette
a83de9cf9d am 17cdbe10: am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
* commit '17cdbe10616e38450064d758232f78c7cacc83f4':
  Fix inaccurate TypedArray.getDrawable() documentation
2014-09-23 15:50:22 +00:00
Ruben Brunk
e2120388c8 am 969be13e: am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
* commit '969be13ecc9ec7d9e35575d46f22fdd2da5866af':
  camera2: Avoid spurious IDLE transitions.
2014-09-23 15:49:58 +00:00
John Reck
5315ce4bf1 am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev
* commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7':
  Aggressively trim memory for system_process
2014-09-23 15:49:41 +00:00
Wink Saville
2ed12a198f am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." into lmp-sprout-dev
* commit 'd428d7bf62be4dbe39489947eaea98f6fc933e08':
  Cleanup NetworkCapabilities.
2014-09-23 15:49:08 +00:00
George Mount
004b7a3f19 am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
  Force transitioning views to be visible when transition interrupted.
2014-09-23 14:33:08 +00:00
George Mount
cbd333b256 Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev 2014-09-23 14:27:36 +00:00