Commit Graph

16797 Commits

Author SHA1 Message Date
Jeff Brown
a50ee3ecb3 Don't build framework tests for simulator target.
Change-Id: I70f29c7eb307e4f3ec5702f4eb9d97b4342e2f36
2010-07-14 22:55:02 -07:00
Andrew Stadler
d14dbcf75e am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp

* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
  Skip hostname verification when using insecure factory
2010-07-14 22:39:19 -07:00
Andrew Stadler
bce6e1736e am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory
2010-07-14 22:33:42 -07:00
Andrew Stadler
26582158a4 Merge "Skip hostname verification when using insecure factory" into froyo 2010-07-14 22:26:56 -07:00
Mathias Agopian
a2d3f064be am 24651682: added BinderService<> template to help creating native binder services
Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp

* commit '24651682edaf71e8a826f23a7ea09bc97c8072c4':
  added BinderService<> template to help creating native binder services
2010-07-14 20:16:27 -07:00
Mathias Agopian
76648df37d am 4055b780: Merge "move native services under services/" into gingerbread
Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
  move native services under services/
2010-07-14 18:45:56 -07:00
Mathias Agopian
a1e6bc864f added BinderService<> template to help creating native binder services
Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
2010-07-14 18:43:19 -07:00
Mathias Agopian
ada17246d3 Merge "move native services under services/" into gingerbread 2010-07-14 18:42:54 -07:00
Mathias Agopian
81bac09fa6 move native services under services/
moved surfaceflinger, audioflinger, cameraservice

all native services should now reside in this location.

Change-Id: Iee42b83dd2a94c3bf5107ab0895fe2dfcd5337a8
2010-07-14 17:59:35 -07:00
Dianne Hackborn
fddb4b4caa am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread
Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp

* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
  Argh oops I didn't mean to delete this.
2010-07-14 17:04:58 -07:00
Dianne Hackborn
134d67be4d Merge "Argh oops I didn't mean to delete this." into gingerbread 2010-07-14 17:02:49 -07:00
Jim Miller
0fc236e135 am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp

* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
  Fix 2797185: Re-enable thumbnail generation in framework
2010-07-14 17:02:36 -07:00
Jim Miller
e69032ffc6 Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 2010-07-14 16:59:52 -07:00
Dianne Hackborn
d30f245680 am ccc77328: Merge "Remove old glue code." into gingerbread
Merge commit 'ccc77328da66436010f3bca000c4b4665270500a' into gingerbread-plus-aosp

* commit 'ccc77328da66436010f3bca000c4b4665270500a':
  Remove old glue code.
2010-07-14 16:49:05 -07:00
Dianne Hackborn
55bee1541a Merge "Remove old glue code." into gingerbread 2010-07-14 16:46:37 -07:00
Mathias Agopian
5078529ef0 am c9a11088: Merge "first step at implementing the native sensor support" into gingerbread
Merge commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06' into gingerbread-plus-aosp

* commit 'c9a11088e503b9e3ae52a3f671b2d21f5cd54f06':
  first step at implementing the native sensor support
2010-07-14 16:36:19 -07:00
Mathias Agopian
c649fb1cc1 am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread
Merge commit '38eea8bf990540360b45b963195a7766c30b55d2' into gingerbread-plus-aosp

* commit '38eea8bf990540360b45b963195a7766c30b55d2':
  Remove the YV16 format for simplicity's sake.
2010-07-14 16:35:55 -07:00
Mathias Agopian
e1ea0811de Merge "first step at implementing the native sensor support" into gingerbread 2010-07-14 16:32:04 -07:00
Mathias Agopian
91c2a6644e Merge "Remove the YV16 format for simplicity's sake." into gingerbread 2010-07-14 16:30:41 -07:00
The Android Open Source Project
1ffda8d7e9 merge from open-source master
Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
2010-07-14 16:11:13 -07:00
Konstantin Lopyrev
9922af3359 am 6e0f65fd: Adding focus change notification
Merge commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1' into gingerbread-plus-aosp

* commit '6e0f65fd9c8bea91d9143f77a85b6d9c097fb3f1':
  Adding focus change notification
2010-07-14 16:04:44 -07:00
Mathias Agopian
48c3476371 Remove the YV16 format for simplicity's sake.
Change-Id: Iee03d100933ba0c67b13d51e0435be3b4cd953cf
2010-07-14 15:12:05 -07:00
The Android Open Source Project
ae0d374d26 merge from open-source master
Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
2010-07-14 12:18:01 -07:00
Steve Howard
dbe336cabc am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Steve Howard
91397cb3f0 Merge "Download manager support for file URIs + last modified time" into gingerbread 2010-07-14 11:19:38 -07:00
Jean-Michel Trivi
12b581e90e am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
2010-07-14 11:12:14 -07:00
Jean-Baptiste Queru
022164b58e Merge "Start app with several activities with intent filter [Main, Launcher] was broken" 2010-07-14 09:03:30 -07:00
Mathias Agopian
589ce85ee4 first step at implementing the native sensor support
in this commit:
- implemented the C stub
- implemented the binder interfaces involved
- implemented most of the C++ client side

missing:
- SensorManager cannot connect to the SensorServer yet
(because there is no SensorServer yet)

Change-Id: I75010cbeef31c98d6fa62fd5d388dcef87c2636b
2010-07-13 22:21:56 -07:00
Mathias Agopian
7985f1a081 am 36ff93aa: Merge "NDK sensor API" into gingerbread
Merge commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a' into gingerbread-plus-aosp

* commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a':
  NDK sensor API
2010-07-13 21:19:58 -07:00
Mathias Agopian
7bd6b95749 Merge "NDK sensor API" into gingerbread 2010-07-13 21:18:30 -07:00
Dianne Hackborn
bea17e6943 am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp

* commit '021e906a46f044025ce0a4632309abecd069240d':
  Fix docs build.
2010-07-13 21:14:47 -07:00
Dianne Hackborn
ad48769812 Merge "Fix docs build." into gingerbread 2010-07-13 21:12:22 -07:00
Jack Palevich
a8a90c2009 am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread
Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp

* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
  Fix deadlock when switching between two GLSurfaceViews
2010-07-13 19:12:32 -07:00
Jack Palevich
e263e20ff8 Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread 2010-07-13 19:10:22 -07:00
Dianne Hackborn
54311fdcdf am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp

* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
  IME events are now dispatched to native applications.
2010-07-13 18:55:52 -07:00
Dianne Hackborn
ce838a265d IME events are now dispatched to native applications.
And also:

- APIs to show and hide the IME, and control its interaction with the app.
- APIs to tell the app when its window resizes and needs to be redrawn.
- API to tell the app the content rectangle of its window (to layout
  around the IME or status bar).

There is still a problem with IME interaction -- we need a way for the
app to deliver events to the IME before it handles them, so that for
example the back key will close the IME instead of finishing the app.

Change-Id: I37b75fc2ec533750ef36ca3aedd2f0cc0b5813cd
2010-07-13 18:36:46 -07:00
Jeff Brown
29f5e89e2c am fd035829: Add initial gamepad support.
Merge commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7' into gingerbread-plus-aosp

* commit 'fd03582995e0fce963dd0fa0669e3211b74c0dd7':
  Add initial gamepad support.
2010-07-13 17:46:19 -07:00
Jeff Brown
8575a87b0d Add initial gamepad support.
Change-Id: I0439648f6eb5405f200e4223c915eb3a418b32b9
2010-07-13 17:04:57 -07:00
Jean-Baptiste Queru
cd39a755a5 Merge "Telephony: Process MT SMS with MTI set to 3" 2010-07-13 16:20:30 -07:00
Brad Fitzpatrick
2562c29b50 am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()
Merge commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6' into gingerbread-plus-aosp

* commit 'c0a7e690bfd32dd897ceccd04dd0fa6bf6e9cee6':
  Add Parcel::readExceptionCode() and Parcel::writeNoException()
2010-07-13 15:55:05 -07:00
Brad Fitzpatrick
837a0d0fb2 Add Parcel::readExceptionCode() and Parcel::writeNoException()
Add native Parcel methods analogous to the Java versions.

Currently, these don't do much, but upcoming StrictMode work changes
the RPC calling conventions in some cases, so it's important that
everybody uses these consistently, rather than having a lot of code
trying to parse RPC responses out of Parcels themselves.

As a summary, the current convention that Java Binder services use is
to prepend the reply Parcel with an int32 signaling the exception
status:

     0: no exception
     -1: Security exception
     -2: Bad Parcelable
     -3: ...
     -4: ...
     -5: ...

... followed by Parceled String if the exception code is non-zero.

With an upcoming change, it'll be the case that a response Parcel can,
non-exceptionally return rich data in the header, and also return data
to the caller.  The important thing to note in this new case is that
the first int32 in the reply parcel *will not be zero*, so anybody
manually checking for it with reply.readInt32() will get false
negative failures.

Short summary: If you're calling into a Java service and manually
checking the exception status with reply.readInt32(), change it to
reply.readExceptionCode().

Change-Id: I23f9a0e53a8cfbbd9759242cfde16723641afe04
2010-07-13 15:45:18 -07:00
James Dong
8b7afb784a am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__
Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build
2010-07-13 13:43:39 -07:00
Konstantin Lopyrev
81553e4c07 am c1ca7f8c: Merge "Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)" into gingerbread
Merge commit 'c1ca7f8c537195b830695ca988945c9d1df0e0e4' into gingerbread-plus-aosp

* commit 'c1ca7f8c537195b830695ca988945c9d1df0e0e4':
  Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)
2010-07-13 13:13:17 -07:00
Konstantin Lopyrev
a65139634e Merge "Making sure that the list of windows updates automatically in hierarchy viewer (View Server side)" into gingerbread 2010-07-13 13:10:48 -07:00
Steve Howard
bd4ddfbcaf am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread
Merge commit 'b8d890ebc1923d98d19d24f396442c91eb766b16' into gingerbread-plus-aosp

* commit 'b8d890ebc1923d98d19d24f396442c91eb766b16':
  Initial implementation of the download manager public API.
2010-07-13 13:03:20 -07:00
Steve Howard
d90f789633 Merge "Initial implementation of the download manager public API." into gingerbread 2010-07-13 13:01:41 -07:00
The Android Open Source Project
a689e78f87 merge from open-source master
Change-Id: Id2ad46118e0ca957b65b911c52d7bbcf2a4649a2
2010-07-13 12:33:22 -07:00
Eric Laurent
f5bdb97164 am 8e886be4: Merge "Modifications in audio effect engine state management." into gingerbread
Merge commit '8e886be413570fab6c623930a5775dd36a6d11e1' into gingerbread-plus-aosp

* commit '8e886be413570fab6c623930a5775dd36a6d11e1':
  Modifications in audio effect engine state management.
2010-07-13 12:31:35 -07:00
Eric Laurent
cbf35c041c Merge "Modifications in audio effect engine state management." into gingerbread 2010-07-13 12:29:17 -07:00
Eric Laurent
70d8f430a6 Modifications in audio effect engine state management.
- Separate the updating of effect engine state from the process call in EffectModule so that the state
of all effects in the same effect chain is updated simultaneusly before all process functions are called.
- Added a mechanism for the effect engine to continue being called for processing after receiving the disable
commands untils it considers that the framework can stop calling the process function without causing
a glitch or loosing some effect tail.
- Updated test reverb and equalizer to support this new feature

Change-Id: Icb56ae2c84c076d4dbad6cf733b1a62f823febe7
2010-07-13 12:27:18 -07:00