2665 Commits

Author SHA1 Message Date
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
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
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
Glenn Kasten
5bae9df4e8 Merge "Replace run-time PCM encodings by compile-time constants" 2013-07-23 17:32:10 +00:00
Glenn Kasten
6824a143c9 Merge "Remove unused includes" 2013-07-23 17:01:54 +00:00
Glenn Kasten
9ad3afe52e Merge "Return correct status for android.media.AudioRecord.read(short[]...)" 2013-07-23 14:32:27 +00:00
Igor Murashkin
6944165014 Merge "camera2 api: marshal rect, size, string for metadata" 2013-07-22 21:38:55 +00:00
Glenn Kasten
82c2d54b53 Remove unused includes
Change-Id: Id9842fe092aba2761c0641c76ad06749b2e1d9b3
2013-07-22 12:48:30 -07:00
Glenn Kasten
5b1576ccbd Use switch in callback handler for events, and no EVENT_MORE_DATA
EVENT_MORE_DATA is no longer possible for the transfer mode used by Java.

Change-Id: Iffd98bca8adea7e066d5d069e82aa841e5c02330
2013-07-22 12:34:43 -07:00
Glenn Kasten
70c17f4703 Merge "Inform AudioFlinger of device's low RAM attribute" 2013-07-22 15:02:29 +00:00
Glenn Kasten
3f0af8be9e Return correct status for android.media.AudioRecord.read(short[]...)
This is similar to Change-Id: If43c63a4ceeb8fef98708f0d42496d2fb90a21fd

Bug: 9776374
Change-Id: I8d9e03b70ad55b4e1b3acfe26e31de8b374e2b43
2013-07-22 07:39:13 -07:00
Mathias Agopian
d84feebba4 Merge "update to new Consumer APIs" 2013-07-20 01:03:22 +00:00
Michael Wright
7caaeeb6a8 Merge "Add input device property for buttons under touchpads" 2013-07-19 22:45:51 +00:00
Glenn Kasten
9d2bc860d3 Replace run-time PCM encodings by compile-time constants
Simplify the code to use the constant values of ENCODING_PCM_16BIT and
ENCODING_PCM_8BIT from AudioFormat.java.

There is already a comment in AudioFormat.java saying that these symbols
need to be kept in sync with this file, and they are public static final
so they can never be changed.

This change is similar to commit 3d301cb2b1d9e61c3af8a8b0b9db370d3d7abf77
or Change-Id I6cb10ac511df4845610454d1659e64d9195d67cd

Change-Id: Ib62d8cfeb6261ffd362dba3600d593e2a268d76a
2013-07-19 13:31:33 -07:00
Igor Murashkin
3710db80d4 camera2 api: marshal rect, size, string for metadata
Change-Id: Iec2fd823bc92394da44abb32ca38a625d7638e3d
2013-07-19 12:04:48 -07:00
Mike Lockwood
757ec7837d Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET" 2013-07-19 17:39:28 +00:00
Chris Craik
ef5498edf6 Merge "Add reconfigure method to Bitmap" 2013-07-18 22:55:44 +00:00
Glenn Kasten
fd116ad1ab Inform AudioFlinger of device's low RAM attribute
to help it configure it's memory

Bug: 9798886
Change-Id: Ia2df59cfcb76f5ff48cca92b107915e2adde899c
2013-07-18 10:03:27 -07:00
Eric Laurent
230e0120a4 Merge "Fix media server restart detection mechanism" 2013-07-18 16:12:59 +00:00
Eric Laurent
ca35e48234 Fix media server restart detection mechanism
There is a flaw in the mechanism used by AudioService
to detect the fact that mediaserver process did crash and restart.
It relies on polling AudioFlinger service until a successful
connection triggers a callback into AudioSystem JNI and then into AudioService.
But if another thread in system_server process, not attached to the
JNI environment, reconnects before AudioService, the callback is called in
a detached context and dropped.

The fix consists in attaching the thread executing the callback
and detaching it if needed.

Bug: 9693068.
Change-Id: I184308b12a3f87653bf818abf0159e0e45a66ef0
2013-07-18 09:10:56 -07:00
Michael Wright
7ddd11035b Add input device property for buttons under touchpads
Bug: 8990644
Change-Id: I2cc10457595a861b707c0394bd435d60efa8405b
2013-07-17 16:19:25 -07:00
Chris Craik
c84d203da2 Add reconfigure method to Bitmap
bug:9797004

Grants a means to reuse a bitmap's allocation for different
width/height/Config without going through
BitmapFactoryOptions.inBitmap

Change-Id: Ib62319f3bd96c451fc1636288adf06a8275b4e3d
2013-07-17 12:08:01 -07:00
Mathias Agopian
e32632682c update to new Consumer APIs
Change-Id: I8649f3add40e0aeeeb0396b98e2cb93312e8e990
2013-07-16 23:14:24 -07:00
Mike Lockwood
e7d309a929 LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET
Also replaced some JNI code with libcore IO support

Change-Id: I091e2b6b8dd1fec554936c1ffab29e50f0979e4a
2013-07-16 17:31:15 -07:00
Dianne Hackborn
cdae0f3c60 Merge "Switch proc stats to use new process state constants." 2013-07-16 18:15:09 +00:00
Glenn Kasten
78b6a8615c Merge "AudioTrack write() on a full buffer while paused returns 0" 2013-07-16 17:54:26 +00:00
Rom Lemarchand
0a880d0402 Merge "Increase swappiness of processes when memcgroups are enabled" 2013-07-16 02:32:13 +00:00
Mathias Agopian
377d7bd543 Merge "always pass the BufferQueue explicitely to consumers" 2013-07-16 02:17:56 +00:00