ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,713 Commits 2 Branches 0 Tags 54 MiB
083b89a41c
Commit Graph

16713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
083b89a41c am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread 
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp

* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
  Add native C APIs for working with the Asset Manager
 2010-07-15 15:03:32 -07:00
Christopher Tate
005c212acd Merge "Add native C APIs for working with the Asset Manager" into gingerbread 2010-07-15 15:00:14 -07:00
James Dong
0d049910d8 am 42ef0c71: Initial check-in for software m4v_h263 encoder 
Merge commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae' into gingerbread-plus-aosp

* commit '42ef0c715da879a9878b7bf4eb9c90b21e4ab8ae':
  Initial check-in for software m4v_h263 encoder
 2010-07-15 14:37:33 -07:00
Christopher Tate
9373680116 Add native C APIs for working with the Asset Manager 
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
 2010-07-15 14:28:21 -07:00
Steve Howard
fd5a8250e9 am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
 2010-07-15 12:28:39 -07:00
Steve Howard
f568a7480d Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Scott Main
69c3a5cddf am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
 2010-07-15 11:23:08 -07:00
Scott Main
5e22cd7219 am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
 2010-07-15 11:20:32 -07:00
James Dong
f0ff0aa6b7 am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread 
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp

* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
  Support user-supplied timescales for authoring
 2010-07-15 11:18:53 -07:00
Scott Main
a4e25ab1f3 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
James Dong
13bea64393 Merge "Support user-supplied timescales for authoring" into gingerbread 2010-07-15 11:16:08 -07:00
Joe Onorato
87d49d86d8 am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread 
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp

* commit '562124e84d8ae63b614b14ba257680571091ef1f':
  Clean up some style in the makefiles.
 2010-07-15 11:12:57 -07:00
Joe Onorato
3efa627241 am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp

* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
  The ICU data is no longer compiled directly into the shared library.
 2010-07-15 11:12:53 -07:00
Joe Onorato
51b23cda38 Merge "Clean up some style in the makefiles." into gingerbread 2010-07-15 11:08:39 -07:00
Joe Onorato
72f26b73d2 Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread 2010-07-15 11:08:34 -07:00
Jeff Brown
015b8a66db am eb6e0df1: Don\'t build framework tests for simulator target. 
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp

* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
  Don't build framework tests for simulator target.
 2010-07-15 10:21:18 -07:00
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