Commit Graph

3477 Commits

Author SHA1 Message Date
3c40a046cf camera2: Update native<->managed camera metadata marshalers
* Improve existing marshalers:
 - each managed/native type combination can be queried marshal support
 - marshalers can recursively call other marshalers for nested types
 - support marshaling/unmarshaling generic classes by using super type tokens

* Add new marshalers for:
 - ColorSpaceTransform
 - MeteringRectangle
 - Parcelable
 - Range<T>
 - ReprocessFormatsMap
 - RggbChannelVector
 - SizeF
 - StreamConfiguration
 - StreamConfigurationDuration

Batteries included; so are unit tests.

Bug: 14628001
Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
2014-05-13 15:28:24 -07:00
66f0be65a1 Wire up texture atlas
Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
2014-05-13 14:54:42 -07:00
c8ac775659 More native interpolators
Gotta collect 'em all

Change-Id: I3ccc2b5c842b27b906c8a0470fbedc2bf285bc38
2014-05-12 16:42:02 -07:00
315c329544 Add TimeInterpolator support to RNA
Bug: 14678626

Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
2014-05-12 14:41:06 -07:00
c42bfb95c6 Merge "Refactor VirtualLightRefBase & JNI" 2014-05-09 23:18:26 +00:00
9fa4071c47 Refactor VirtualLightRefBase & JNI
Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
2014-05-09 15:28:54 -07:00
32054b0b3e Fix Bitmap.cpp line endings
Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
2014-05-09 13:59:36 -07:00
54955e33c8 Add hidden support for ENCODING_PCM_FLOAT to AudioTrack
Change-Id: I15e6d6ab34846366e7f5cbf948fd3cb327e72632
2014-05-08 16:11:42 -07:00
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
2014-05-08 18:31:18 +00:00
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
db55bb0622 am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
  Remove unused LOCAL_LDLIBS.
2014-05-08 00:27:09 +00:00
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
2014-05-08 00:21:38 +00:00
531fecca1c Merge "Encapsulate Canvas.mNativeCanvas" 2014-05-07 22:44:47 +00:00
b38e3fdf5a Remove unused LOCAL_LDLIBS.
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
2014-05-07 15:23:37 -07:00
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
832b151465 Cleanup attachFunctor
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
2014-05-07 14:39:44 -07:00
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
63a0667325 Implement TODO(romainguy)
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
2014-05-07 13:45:54 -07:00
c29a0a4664 Avoid caching shadow properties in Java & HWUI.
bug: 10650594
Change-Id: I6f57df002710bb0567ed7e53fc0bfe96cfd504b8
2014-05-07 09:36:04 -04:00
08fa40c5cb First pass at adding FingerprintManagerService
This adds a new service for monitoring and enrolling fingerprints
to the platform.

Fixed documentation links.

Change-Id: I66013be5e09be9c5f9746c46aacf32d3e26c3b73
2014-05-07 02:27:21 +00:00
c677675e9c Encapsulate Canvas.mNativeCanvas
Currently, the native canvas is accessed/manipulated from several
unrelated classes.

In order to facilitate SaveFlags emulation, this CL encapsulates
the field and refactors its external users.

Two main changes:

* new getNativeCanvas() getter for use in Java-level clients.
* JNI canvas swappers (GraphicsBuffers, Surface, TextureView &
  AssetAtlasService) are refactored based on the exising/equivalent
  safeCanvasSwap() Canvas method.

Change-Id: I966bd4898f0838fb3699e226d3d3d51e0224ea97
2014-05-06 21:07:19 -04:00
6c8e788e37 Merge "Fix crash due to texture view callback threading invariants." 2014-05-07 00:47:08 +00:00
313f59887b Add AudioFormat.ENCODING_PCM_FLOAT
Change-Id: I030d2c74224ac8573a4d30d980ae94fa4e280aeb
2014-05-06 17:24:26 -07:00
c7282e57cd Fix crash due to texture view callback threading invariants.
Allow the client of a SurfaceTexture to specify the Handler to
which the update callback should be directed to avoid unnecessary
scheduling ping-pong between threads.

Fixed an invalid assumption in TextureView that it is attached
to the main looper which could result in a crash under certain
circumstances.  In normal app processes, it is true that TextureViews
must be created on the main looper since hardware rendering is
currently only supported on the main looper.  However, in the
system server, UI components run a different thread.  Although
hardware rendering is normally disabled in the system server,
it may be enabled for certain developer features.

Bug: 14445309
Change-Id: I5ae17ad018b9ef05ba87ec2f972c7c82e2bca70a
2014-05-06 17:13:43 -07:00
9bd01ef0c6 Merge "Enable changing display configuration" 2014-05-06 21:08:15 +00:00
00101052b5 Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: Ie4363bc8353d95428f1114ea48e5b1c8976e1730
2014-05-06 11:34:06 -07:00
e4280baaa7 Implement loadSystemProperties
Bug: 14087580

Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
2014-05-05 16:39:37 -07:00
f9be77940e Make RenderNodeAnimator and WebView play nice
Change-Id: Ifaefcf510b2d377663fc86f60608d6ec9be8329a
2014-05-05 12:35:30 -07:00
5d039c458c Merge "TIME LORD!" 2014-05-05 19:21:26 +00:00
18f16e6fba TIME LORD!
Bug: 14444180

Change-Id: I68bec3807c4d1c88d5af1aec2fe6907d60b5f2f3
2014-05-05 10:57:04 -07:00
32ef3ae085 camera3: Update CameraMetadata vendor tag handling.
Bug: 12134423
Change-Id: I19380fb5acc3e23a6181d8f858c13457993480fc
2014-05-02 20:34:41 -07:00
9dfcbb8403 Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" 2014-05-03 00:29:01 +00:00
31efe22b40 Revert "camera3: Update CameraMetadata vendor tag handling."
This reverts commit e03a7eab1d.

Change-Id: I1682b5b0904974f488d3e51c3dbaa8f9f02ac71d
2014-05-03 00:28:49 +00:00
5295745026 Merge "camera3: Update CameraMetadata vendor tag handling." 2014-05-02 22:23:29 +00:00
52244fff29 Add CanvasProperty for drawCircle
Change-Id: Icbcc030f5033d2094e567d7c519b9d672f2aac1c
2014-05-02 13:43:46 -07:00
27e12e7292 Merge "fix AudioTrack and AudioRecord JNI" 2014-05-01 23:49:51 +00:00
c9722bd8af am 6c2e8062: am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '6c2e806200dc1a422aa681bfd78aae1eb8f1d508':
  Fix broken logging in Zygote.cpp.
2014-05-01 10:27:18 +00:00
6c2e806200 am 70344223: am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '703442238200c2f1a35b51e7aadc693322feb69d':
  Fix broken logging in Zygote.cpp.
2014-05-01 10:22:56 +00:00
7034422382 am fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit 'fbb0ab02bed5c49159acb3dba6848a154e524169':
  Fix broken logging in Zygote.cpp.
2014-05-01 10:18:11 +00:00
160992da04 Fix broken logging in Zygote.cpp.
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
  only if the *first* call to waitpid returned ECHILD.

Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
2014-05-01 10:11:57 +00:00
abea8fa237 Merge "Add missing ifdefs" 2014-05-01 00:07:45 +00:00
496b8770c1 Add missing ifdefs
Change-Id: I1c7c66cf81a31b56e6ae65d34b7936f9e8beec29
2014-04-30 16:59:40 -07:00
fae7bedcf0 am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit 'f84493ec95bfce41106673645a3e56b185e54df5':
  Fix for native leaks in YuvToJpegEncoder.cpp
2014-04-30 23:19:03 +00:00
3d4c64191a fix AudioTrack and AudioRecord JNI
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

Change-Id: Ib30b71e0d4007c4b574bc409963ddc5975ad4f78
2014-04-30 12:40:24 -07:00
f84493ec95 am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '91ff3c18dbb61ed0087f741dd2bdf911ecf42fef':
  Fix for native leaks in YuvToJpegEncoder.cpp
2014-04-30 19:07:01 +00:00
91ff3c18db am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
  Fix for native leaks in YuvToJpegEncoder.cpp
2014-04-30 19:02:53 +00:00
7d3f9e9730 Merge "Fix for native leaks in YuvToJpegEncoder.cpp" 2014-04-30 18:59:54 +00:00
e03a7eab1d camera3: Update CameraMetadata vendor tag handling.
Bug: 12134423
Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
2014-04-29 16:45:41 -07:00
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
15c32f2699 Merge "Move key attribute information into KeyEvent." 2014-04-29 22:31:06 +00:00