25774 Commits

Author SHA1 Message Date
Andreas Huber
6bcffcd2dc am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp

* commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
2010-08-19 09:11:28 -07:00
Kenny Root
54d4137935 Merge "Add OBB flags to support overlays" into gingerbread 2010-08-19 09:09:32 -07:00
Andreas Huber
8c192fe990 Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread 2010-08-19 09:09:12 -07:00
Eric Laurent
3a899b8510 am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread
Merge commit '0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp

* commit '0b9a12bf8101830fa9bde4015d0043df14cab6db':
  Fix issue 2929440
2010-08-19 08:51:54 -07:00
Eric Laurent
0b9a12bf81 Merge "Fix issue 2929440" into gingerbread 2010-08-19 08:49:20 -07:00
Steve Howard
1f44210482 am e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread
Merge commit 'e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4' into gingerbread-plus-aosp

* commit 'e0c8582e8a9f2b6eb5ebde667ddd1fddf4652bd4':
  Improve orientation sensing when waking up while flat.
2010-08-19 08:32:23 -07:00
Steve Howard
e0c8582e8a Merge "Improve orientation sensing when waking up while flat." into gingerbread 2010-08-19 08:29:29 -07:00
Eric Laurent
8448a79767 Fix issue 2929440
Fixed regression introduced by change a54d7d3d7dd691334189aab20d23c65710092869 in audioflinger mixer thread:
When the output stream is suspended, the sleep time between two writes must match the actual duration
of one output stream buffer otherwise the playback rate is not respected.

Change-Id: Ic5bebe890290d1f44aeff9dd3c142d18e26fff2a
2010-08-19 08:15:08 -07:00
Chia-chi Yeh
eb21c38a53 am f49c1689: Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread
Merge commit 'f49c1689b54aec6ce0272c805224625da73e2188' into gingerbread-plus-aosp

* commit 'f49c1689b54aec6ce0272c805224625da73e2188':
  RTP: fix few leaks when fail to add streams into a group.
2010-08-19 07:59:38 -07:00
Wei-Ta Chen
9f7257f0a1 am 8d124f70: Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread
Merge commit '8d124f709e5c55f9737a336cda353af3dfb04605' into gingerbread-plus-aosp

* commit '8d124f709e5c55f9737a336cda353af3dfb04605':
  Fix a bug, where one thread is using JNIEnv associated with another thread.
2010-08-19 07:59:35 -07:00
Chia-chi Yeh
f49c1689b5 Merge "RTP: fix few leaks when fail to add streams into a group." into gingerbread 2010-08-19 03:36:36 -07:00
Chia-chi Yeh
b879032347 RTP: fix few leaks when fail to add streams into a group.
Change-Id: Iefb3fe219ad48641da37a83c8d14e9ebf1d3086c
2010-08-19 18:26:53 +08:00
Chia-chi Yeh
c3308074cd Use getMinFrameCount() instead of querying AudioSystem directly.
Change-Id: I6c4d2f1778703c1fd1ba5610c46e77c857418bff
2010-08-19 17:14:36 +08:00
Wei-Ta Chen
8d124f709e Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread 2010-08-19 00:28:10 -07:00
Chia-chi Yeh
e18790856b am ae93f52e: Merge "RTP: remove froyo-compatible code." into gingerbread
Merge commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6' into gingerbread-plus-aosp

* commit 'ae93f52e4462bbbb5cc908864c20368ac8cbf2a6':
  RTP: remove froyo-compatible code.
2010-08-18 23:14:16 -07:00
Chia-chi Yeh
ae93f52e44 Merge "RTP: remove froyo-compatible code." into gingerbread 2010-08-18 23:12:20 -07:00
Wei-Ta Chen
291303ba3d Fix a bug, where one thread is using JNIEnv associated with another thread.
We see abort messages like this when using JavaPixelAllocator and JavaMemoryUsageReporter.
W/dalvikvm(  680): JNI WARNING: threadid=2 using env from threadid=10
W/dalvikvm(  680):              in Landroid/graphics/LargeBitmap;.nativeClean (I)V (CallVoidMethodV)

To fix it, we keep JavaVM, rather than JNIEnv, in JavaPixelAllocator and JavaMemoryUsageReporter,
because JavaVM allows us to get the JNIEnv corresponds to the current thread.

Change-Id: Ibd4b394a53dd3fdccc5a442eeb0dedf836479575
2010-08-19 12:21:44 +08:00
Mathias Agopian
e8963f7c37 fix [2931718] glDrawArrays skips a triangle when more than 70 vertices are used.
a typo prevented the last 2 vertices of a batch to be copied to the front of
the next batch. Instead, the 2 very first vertices were used.

Change-Id: I3c344784dac1cef64df2fb6f6efb2f901cc788db
2010-08-18 20:07:25 -07:00
Jeff Brown
36beeca4c3 am 3d8c9bdb: Raise motion event throttle to 60Hz from 35Hz.
Merge commit '3d8c9bdbed0c31143227697bd0d94fd234fe08ad' into gingerbread-plus-aosp

* commit '3d8c9bdbed0c31143227697bd0d94fd234fe08ad':
  Raise motion event throttle to 60Hz from 35Hz.
2010-08-18 17:52:17 -07:00
Jeff Brown
3d8c9bdbed Raise motion event throttle to 60Hz from 35Hz.
Bug: 2931575
Change-Id: Ib8b1793addcda74b2fa6de2ce61b6133b8ffda9d
2010-08-18 17:48:53 -07:00
Jeff Brown
d25f0aea1c am 99401b29: Merge "Add support for throttling motion events." into gingerbread
Merge commit '99401b29c3f39488a058d3eb616009b751879a77' into gingerbread-plus-aosp

* commit '99401b29c3f39488a058d3eb616009b751879a77':
  Add support for throttling motion events.
2010-08-18 17:42:47 -07:00
Jeff Brown
99401b29c3 Merge "Add support for throttling motion events." into gingerbread 2010-08-18 17:40:44 -07:00
Dianne Hackborn
d172594e3a am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp

* commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-18 17:08:36 -07:00
Dianne Hackborn
cf6d2a1de2 Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread 2010-08-18 17:05:40 -07:00
Jeff Brown
ae9fc03bdc Add support for throttling motion events.
Change-Id: I24b3a17753e91ecda60a60fe5cd2e6b3260e033d
2010-08-18 16:58:27 -07:00
Mathias Agopian
43647129d6 am 17da0663: Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread
Merge commit '17da06631041f9f2237738fb673a74a85b1d9cf4' into gingerbread-plus-aosp

* commit '17da06631041f9f2237738fb673a74a85b1d9cf4':
  fix [2931161] crash in labyritnth when completing a level
2010-08-18 16:34:40 -07:00
Mathias Agopian
17da066310 Merge "fix [2931161] crash in labyritnth when completing a level" into gingerbread 2010-08-18 16:31:36 -07:00
Dianne Hackborn
b424b633bb Fix issue #2845673: android:exported="false" is not obeyed
Thou shall obey.

Change-Id: I09f163a0db7cc9189c8d7f5116cc8ca9d4f7a76c
2010-08-18 16:07:35 -07:00
Mathias Agopian
100f42a4bf fix [2931161] crash in labyritnth when completing a level
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
2010-08-18 16:07:34 -07:00
Robert Greenwalt
4600139173 am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp

* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
  DO NOT MERGE Do not kill sockets going default->hipri
2010-08-18 15:14:31 -07:00
Robert Greenwalt
6b2c56a299 Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread 2010-08-18 15:11:52 -07:00
Robert Greenwalt
a22ae073cc DO NOT MERGE Do not kill sockets going default->hipri
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
reset unless both are down.

Change-Id: I8dabc42f315943b28ea34721793b0ee330c07bf6
2010-08-18 15:03:46 -07:00
Eric Laurent
ba8da2e61b Audio Effects: fixed "strength supported" parameter size.
The "strength supported" parameter for bass boost and virtualizer effect was incorrectly using a
short value whereas it should be an int. This is to comply to the definition of boolean type in OpenSL ES
that is uint32.

Change-Id: I74ccb61dcc70fc9d390524a1ca5bbbd8b13ab1af
2010-08-18 14:31:25 -07:00
Brad Fitzpatrick
cf2c68c9c2 am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp

* commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-18 14:23:23 -07:00
Steve Howard
5eb49583e2 Improve orientation sensing when waking up while flat.
This change makes the window manager pass the currently displayed
orientation to the WindowOrientationListener each time to calls to get
the currently sensed orientation.  Now, when the
WindowOrientationListener doesn't know for sure what the orientation
of the device should be (for example, if the sensed orientation is
flat on a table), then it trusts the already-displayed orientation,
rather than trusting whatever sensors reading it most recently
received.

The main use case this addresses is:
* user uses device in portrait
* user turns off device, puts it in pocket
* while in pocket, screen gets turned on, activating orientaiton
  sensor, which senses landscape orientation
* screen timed out
* user takes device out, places it on a table (or looks down at it,
  holding it flat), and unlocks it

Previously, when the device was unlocked, the
WindowOrientationListener would return landscape orientation based on
its previous sensor readings.  Now, it will override those previous
readings because it knows they never actually took effect and the
device is presently flat.

This change also slightly modifies the way we handle flat orientation,
now completely ignoring data when the tilt distrust is nonzero (even
if the current sensor reading shows non-tilted).

Change-Id: Ia4950a41827f8c53a80487d0c2e83b556df781b9
2010-08-18 14:22:19 -07:00
Brad Fitzpatrick
11709ab07c Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread 2010-08-18 14:21:32 -07:00
Jean-Baptiste Queru
6d5bb88454 am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread
Merge commit 'aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp

* commit 'aac6a7481757e3477e489f311e53385988a5d9a0':
  Only monitor recognized uevent devices.
2010-08-18 13:59:43 -07:00
Mathias Agopian
4195d097c5 am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread
Merge commit '8ad86fef49a732617dc26be9324af60f9975342d' into gingerbread-plus-aosp

* commit '8ad86fef49a732617dc26be9324af60f9975342d':
  Improve documentation of getAltitude
2010-08-18 13:57:18 -07:00
Mathias Agopian
8e13ce52f3 am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp

* commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03':
  revert hwcomposer HAL changes. DO NOT MERGE.
2010-08-18 13:57:15 -07:00
Jean-Baptiste Queru
aac6a74817 Merge "Only monitor recognized uevent devices." into gingerbread 2010-08-18 13:56:58 -07:00
Mathias Agopian
8ad86fef49 Merge "Improve documentation of getAltitude" into gingerbread 2010-08-18 13:55:01 -07:00
Mathias Agopian
26bcc7b442 Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread 2010-08-18 13:54:46 -07:00
Sean McNeil
aeb00c409d Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.

Change-Id: Ib2c93105e7d746d9c1a7414bea8bab3fb8c0b70a
2010-08-18 13:53:36 -07:00
Jean-Baptiste Queru
34df5ccca4 Merge "fix build" into gingerbread-plus-aosp 2010-08-18 13:48:38 -07:00
Jean-Baptiste Queru
a00f8db5ef fix build
Change-Id: I13a6a34e8eae73b046769df365be8a46489bd111
2010-08-18 13:47:45 -07:00
Jeff Brown
33992d4195 am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Merge commit '72e0b2ab08dc49857955a4560de296fdddada8dc' into gingerbread-plus-aosp

* commit '72e0b2ab08dc49857955a4560de296fdddada8dc':
  Fix some input device mapping bugs with certain drivers.
2010-08-18 13:42:34 -07:00
Konstantin Lopyrev
28bd3a54ec am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp

* commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16':
  Making sure the draw time is measured.
2010-08-18 13:39:29 -07:00
Jens Gulin
25af9997b9 am c4554b9a: Keep track of remaining fd when devices are removed
Merge commit 'c4554b9a0885ac3713575e91d8d33c5670b52322' into gingerbread-plus-aosp

* commit 'c4554b9a0885ac3713575e91d8d33c5670b52322':
  Keep track of remaining fd when devices are removed
2010-08-18 13:39:24 -07:00
Brian Carlstrom
03805f729c am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp

* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
  tracking merge of external/apache-http from dalvik-dev
2010-08-18 13:39:15 -07:00
Wu-cheng Li
a2527055f8 am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp

* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 13:39:01 -07:00