2690 Commits

Author SHA1 Message Date
Michael Wright
51b4a40ef5 Merge "Expose vendor and product IDs for InputDevices" into klp-dev 2013-08-13 00:04:08 +00:00
Michael Wright
54e56946d1 Expose vendor and product IDs for InputDevices
Change-Id: I08665a41e474cbedd10b342eeae20d2ca7c03ac0
2013-08-12 16:39:59 -07:00
Romain Guy
d1f6b6245c Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev 2013-08-12 20:52:13 +00:00
Romain Guy
b15b446f42 Take text alignment into account to compue text bounds
Bug #10258621

Change-Id: I91abf1829a1814410ce8c0c2c17d888031987f18
2013-08-12 13:25:29 -07:00
Colin Cross
cb4728f247 parse named anonymous memory for dumpsys meminfo
Treat [anon:libc_malloc] as native heap and anything else that
starts with [anon: as unknown.

Bug: 10212959
Change-Id: Ifd120ae86e7a22291383df37d2b96f9f2dcd68b9
2013-08-09 20:37:23 +00:00
Mathias Agopian
5893a97cbf Merge "fix-up dependencies to gl headers" into klp-dev 2013-08-09 04:39:55 +00:00
Mathias Agopian
e3eae73abb fix-up dependencies to gl headers
Change-Id: I9f176847587db1f9ccee2bc425106d277ffceee6
2013-08-08 21:09:16 -07:00
Jeff Sharkey
8a65f5b871 Merge "Allow packages.list access with new GID." into klp-dev 2013-08-09 00:44:55 +00:00
Jeff Sharkey
184a0100ab Allow packages.list access with new GID.
The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.

Also switches FileUtils to use Libcore.os.

Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
2013-08-08 17:38:13 -07:00
Jonathan Dixon
427733280b Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev 2013-08-09 00:36:03 +00:00
Jonathan Dixon
667fe1039f Refactor Canvas.drawPicture() to delegate to Picture
Bug: 9814370

To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.

Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
2013-08-08 17:22:48 -07:00
Jeff Brown
0933570357 Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 2013-08-08 23:30:31 +00:00
Jesse Hall
6a6bc216d1 Use new ISurfaceComposer::destroyDisplay method
Bug: 10191053
Change-Id: I3ecc6880db4a4c77c6db4e8b50faa9b4021d17c6
2013-08-08 15:44:15 -07:00
Vinit Deshapnde
c249c2cc6b Use a single socket to communicate with supplicant
This helps to prepare for future updates from external sources.

Bug: 9298955

Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit fb40801ed8c217ae01082fb1cbd0c30bbf5532ac)
2013-08-08 18:38:53 +00:00
Glenn Kasten
d840526196 Merge "Update audio comments" 2013-08-07 17:17:56 +00:00
Mathias Agopian
24f43c9d2c put TextureView back to async mode
it's probably not strictly needed, but it guarantees
that the app won't deadlock itself while using a
TextureView -- this could happen if it blocked
in View.onDraw() waiting for the producer

this mimics the behavior TextureView always had.

Change-Id: I453339237a48dea91a10840b8cc0f5d2d84d1520
2013-08-06 20:16:12 -07:00
Glenn Kasten
86fad47e68 Update audio comments
Change-Id: If470efd77ed886da8d83a1b427c132bad77e668b
2013-08-06 13:38:16 -07:00
Mathias Agopian
52a9a10b6b Clearly separate consumer and producer interfaces
Bug: 9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
2013-08-06 13:07:42 -07:00
Jean-Baptiste Queru
3c9c091863 Revert "Revert "be more robust with handling unknown sensors""
This reverts commit 17548b3c70fe4f29d33367a61300f5323f5efe99.
2013-08-05 11:03:28 -07:00
Glenn Kasten
f7d280396c Merge "Replace run-time PCM encodings by compile-time constants" 2013-08-05 18:01:27 +00:00
Glenn Kasten
094010925a Merge "Explicitly compare raw pointers to NULL" 2013-08-05 17:27:29 +00:00
Glenn Kasten
4c59c54f77 Merge "Remove dead code in AudioTrack JNI" 2013-08-05 16:35:59 +00:00
Jean-Baptiste Queru
1e01943fe1 am ae311f4c: am 17548b3c: Revert "be more robust with handling unknown sensors"
* commit 'ae311f4c5f86779bb681b9fa8c1122dc174fea72':
  Revert "be more robust with handling unknown sensors"
2013-08-02 17:58:40 -07:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors"
This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
2013-08-02 17:31:54 -07:00
Glenn Kasten
a667ff30e4 Explicitly compare raw pointers to NULL
Change-Id: If76a15509d4121e391e28f26ca273cc00552efa8
2013-08-02 14:51:12 -07:00
Dmitry Shmidt
ec90545b5f dhcp: Get mtu property from dhcp results
Change-Id: I1b032094e0945b27d98f7ac786247b7cc9d60131
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-08-02 14:07:50 -07:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-08-02 13:49:41 -07:00
Glenn Kasten
9afc78d7ce Replace run-time PCM encodings by compile-time constants
Change-Id: I2ab9103f3666d88eb1c7292307cc0a90a6482af6
2013-08-02 12:32:32 -07:00
Glenn Kasten
844b0475ed Remove dead code in AudioTrack JNI
Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
2013-08-02 12:17:29 -07:00
Derek Sollenberger
e242e2f236 Merge "Changes needed to support Skia at r10377." 2013-08-02 17:03:37 +00:00
Derek Sollenberger
5827cb5059 Changes needed to support Skia at r10377.
Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
2013-08-01 12:52:21 -04:00
Elliott Hughes
2a805f9304 resolved conflicts for merge of 368d81fe to master
Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5
2013-07-31 18:25:47 -07:00
Elliott Hughes
6d4b1e24ae Switch Process.myTid over to the libcore JNI too.
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
2013-07-31 17:38:11 -07:00
Jeff Hao
406ec15647 Replace native Process getpid/getuid with calls to libcore equivalents.
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.

(cherry-pick of 5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)

Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
2013-07-31 17:19:23 -07:00
Dianne Hackborn
d45c68dd24 Resource memory optimization.
Don't ever need the cached UTF-16 string conversions on the
device.  Don't need to create those strings, and don't need
to create the lookup array for them at all.  This requires
fixing all of the remaining places in the platform where we
interacted with the resources with the blind assumption that
the strings are UTF-16.

Change-Id: Ia0e5a150499837471e494e85b23b05fa06e0cf1d
2013-07-31 15:57:49 -07:00
Eino-Ville Talvala
2f1a2e423e Camera2 API: Rename package to android.hardware.camera2
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Romain Guy
8018c8db82 Add path ops API
Path ops can be used to combine two paths instances in a single path
object. The following operations can be used:

- Difference
- Reverse difference
- Union
- XOR
- Intersection

To use the API:

Path p1 = createCircle();
Path p2 = createRect();

Path result = new Path();
result.op(p1, p2, Path.Op.DIFFERENCE);

This code will subtract the rectangle from the circle and generate
the resulting path in "result."

Change-Id: Ic25244665b6691a7df0b0002a09da73d937b553b
2013-07-30 10:51:24 -07:00
Mathias Agopian
e591b49de0 single buffer mode for SurfaceTexture
Bug: 9891035
Change-Id: Ib9cc2b64f7ff3c084ef1d7db442db8e7a24a923d
2013-07-26 19:33:54 -07:00
Mathias Agopian
b251f3d0c6 get rid of HAL pixelformats 5551 and 4444
Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
2013-07-26 14:58:00 -07:00
Mathias Agopian
9f213c8b64 Merge changes I487d4eef,Ia750811f
* changes:
  get rid of PixelFormatInfo and simplify things
  get rid of PIXEL_FORMAT_A_8
2013-07-26 20:56:23 +00:00
Alex Ray
da85ef3082 Merge "libandroid_runtime: android_print needs NELEM def" 2013-07-26 19:42:31 +00:00
Mathias Agopian
2ca204e4c0 get rid of PixelFormatInfo and simplify things
Change-Id: I487d4eef7db0095ace4babf5bb100a8769711257
2013-07-25 19:25:10 -07:00
Mathias Agopian
6f7b589171 get rid of PIXEL_FORMAT_A_8
Change-Id: Ia750811f08ddebdd5818da211fd03d61b75f8e97
2013-07-25 17:25:02 -07:00
Colin Cross
eb63254431 Merge "replace cutils/logger.h with log/logger.h" 2013-07-25 21:39:31 +00:00
Alex Ray
aff14e7008 libandroid_runtime: android_print needs NELEM def
NELEM is defined many places in the framework, so this gives
android_print_PdfDocument.cpp one of them (JNIHelp.h).  Without this
updating an upstream library (libskia) to remove an NELEM definition
causes this file to break.

Change-Id: Ifd033f9bd92b8902b6035ec5a8381cb9debd87ce
2013-07-25 14:35:27 -07:00
Colin Cross
44bc186649 replace cutils/logger.h with log/logger.h
and remove it from files that don't use it.

Change-Id: Ieb44a3f1f75c2d2b277f0d01ca926a92211e3fe6
2013-07-24 23:44:45 +00:00
Glenn Kasten
33c437df39 Rename mChannels to mChannelMask to avoid ambiguity
This clarifies that it's a channel mask, as opposed to a count.

Also no need to initialize the field in the declaration,
as it's initialized in the constructor.

Include channel mask in error logs.

Change-Id: Ifc02668cf922dc8826a9fb042b3ca52fad377ba6
2013-07-24 12:20:52 -07:00
Michael Wright
b1f5585f89 Merge "Add controller numbers for gamepads / joysticks" 2013-07-23 20:52:57 +00:00
Michael Wright
ac6c78b6ee Add controller numbers for gamepads / joysticks
Change-Id: I30ac9add6a2473a5ebd83a022c571545e61d1136
2013-07-23 13:50:10 -07:00
Glenn Kasten
922a8c0aa8 Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA" 2013-07-23 20:36:07 +00:00