ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
17,988 Commits 2 Branches 0 Tags 54 MiB
bae7b39496
Commit Graph

17988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
bae7b39496 am fec5d38b: Merge "option to enable multisampling" into gingerbread 
Merge commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2' into gingerbread-plus-aosp

* commit 'fec5d38baf4487d8ab0143451a3f2c39edeeb5b2':
  option to enable multisampling
 2010-09-09 11:58:14 -07:00
Mathias Agopian
55f31ddfc7 Merge "option to enable multisampling" into gingerbread 2010-09-09 11:55:00 -07:00
Mathias Agopian
8296221138 option to enable multisampling 
multisampling can be enabled by specifying the number of
samples desired on the command line.

Change-Id: I5f93c93ae7ada54bcd646c1065e07890d0cb9808
 2010-09-09 11:53:17 -07:00
Steve Howard
837d66f48c am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread 
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
 2010-09-09 11:26:08 -07:00
Mathias Agopian
358fea99da am 6808e6a8: Merge "Fix a few typos in EGL wrapper" into gingerbread 
Merge commit '6808e6a867ba0b32f8bd97163e134c2866423f01' into gingerbread-plus-aosp

* commit '6808e6a867ba0b32f8bd97163e134c2866423f01':
  Fix a few typos in EGL wrapper
 2010-09-09 11:23:16 -07:00
Steve Howard
992c471ca9 Merge "Hidden API to control sorting of download manager queries." into gingerbread 2010-09-09 11:22:38 -07:00
Mathias Agopian
e7bca18f79 Merge "Fix a few typos in EGL wrapper" into gingerbread 2010-09-09 11:20:02 -07:00
Mathias Agopian
77fbf8ddd9 Fix a few typos in EGL wrapper 
Change-Id: I3b815ca6ec334ca12088f9721eece33df42b2e46
 2010-09-09 11:12:54 -07:00
Jaikumar Ganesh
3302c9571c am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread 
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp

* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
  Fix to get A2DP to connect after unpairing
 2010-09-09 10:26:54 -07:00
Jaikumar Ganesh
839a78ea47 Merge "Fix to get A2DP to connect after unpairing" into gingerbread 2010-09-09 10:23:55 -07:00
Andreas Huber
f6aefe0c58 am f3de053c: Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp

* commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e':
  Instead of asserting return a runtime error if the maximum sample size cannot be determined.
 2010-09-09 10:15:33 -07:00
James Dong
ad8af53405 am 5c43a7af: Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 
Merge commit '5c43a7af7b9530016b922ddec0401ab9199cd595' into gingerbread-plus-aosp

* commit '5c43a7af7b9530016b922ddec0401ab9199cd595':
  When 32-bit offset is used,
 2010-09-09 10:15:29 -07:00
Andreas Huber
3a264b5768 Merge "Instead of asserting return a runtime error if the maximum sample size cannot be determined." into gingerbread 2010-09-09 10:13:26 -07:00
James Dong
ed77ca44e1 Merge "When 32-bit offset is used, if the requested max file size is greater than the 32-bit offset limit, set the limit to the max 32-bit offset limit." into gingerbread 2010-09-09 10:13:08 -07:00
Gilles Debunne
a8f50177e0 am ab86b782: Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread 
Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp

* commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
  Fix for text selection in horizontally scrolled TextViews.
 2010-09-09 10:04:32 -07:00
Gilles Debunne
67e272dded Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread 2010-09-09 10:02:05 -07:00
Andreas Huber
57fa22256e am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread 
Merge commit 'a063cd6478254bba3290576ae5556abf469d6535' into gingerbread-plus-aosp

* commit 'a063cd6478254bba3290576ae5556abf469d6535':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
 2010-09-09 10:01:05 -07:00
Andreas Huber
172f2f2dc0 Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread 2010-09-09 09:59:03 -07:00
Robert Greenwalt
b0fda2d60e am 0727a865: Merge "Add network condition reporting." into gingerbread 
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
 2010-09-09 09:49:15 -07:00
Robert Greenwalt
47418849f7 Merge "Add network condition reporting." into gingerbread 2010-09-09 09:41:05 -07:00
Chia-chi Yeh
39832bc227 am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread 
Merge commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d' into gingerbread-plus-aosp

* commit 'f6936a3a52b6bb6de27f75d4e38d116e896b7f4d':
  RTP: prevent buffer overflow in AudioRecord.
 2010-09-09 02:39:58 -07:00
Chia-chi Yeh
1d736aa30f Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread 2010-09-09 02:37:07 -07:00
Chung-yih Wang
329f5ca7f7 am 4d1e0121: Change the keep-alive interval to 10 seconds. 
Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp

* commit '4d1e0121277b566b5e1c22e790a3b607b75d945d':
  Change the keep-alive interval to 10 seconds.
 2010-09-08 22:42:52 -07:00
Neal Nguyen
7a971c0e9a Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp 2010-09-08 20:23:43 -07:00
Mathias Agopian
7d1588e4e3 am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp

* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
  add a fps counter to sanangeles demo
 2010-09-08 19:01:37 -07:00
Mathias Agopian
b1ef9664ad Merge "add a fps counter to sanangeles demo" into gingerbread 2010-09-08 18:57:42 -07:00
Mathias Agopian
879ba138fc add a fps counter to sanangeles demo 
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
 2010-09-08 18:55:42 -07:00
Dirk Dougherty
b91d1dc00a am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp

* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:14:04 -07:00
Dirk Dougherty
225bcbbb3c am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
James Dong
f162d063c1 am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp

* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
 2010-09-08 17:54:28 -07:00
Dirk Dougherty
f84969b2cf Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
James Dong
bc18f2f224 Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 2010-09-08 17:51:59 -07:00
Mike LeBeau
7d8f43d615 am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread 
Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
 2010-09-08 17:46:22 -07:00
Mike LeBeau
cfe9e734e8 Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread 2010-09-08 17:43:15 -07:00
Eric Laurent
6fdd49d4ca am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread 
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp

* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
  Modify type of some environmental reverb parameters
 2010-09-08 17:19:43 -07:00
Eric Laurent
e44e03854c Merge "Modify type of some environmental reverb parameters" into gingerbread 2010-09-08 17:17:38 -07:00
Mathias Agopian
9e003f3528 am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread 
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp

* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
  Force wallpaper surface to 565.
 2010-09-08 16:46:46 -07:00
Mathias Agopian
403d0beb13 Merge "Force wallpaper surface to 565." into gingerbread 2010-09-08 16:43:42 -07:00
John Wang
e841c93910 am a48dc39b: Add hangupForegroundResumeBackground(). 
Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp

* commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
  Add hangupForegroundResumeBackground().
 2010-09-08 15:56:41 -07:00
Brad Fitzpatrick
6e32003ce0 am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread 
Merge commit '65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp

* commit '65634a7935ed6f173179e7ac91a05288693b2bbf':
  Don't block in the BackupManagerService.dataChanged() Binder call.
 2010-09-08 15:26:57 -07:00
Brad Fitzpatrick
0b89753186 Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread 2010-09-08 15:20:20 -07:00
Gilles Debunne
23cd8a0366 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread 
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
 2010-09-08 15:02:20 -07:00
Gilles Debunne
79694bc16e Merge "Fix for a memory leak in TextKeyListener." into gingerbread 2010-09-08 14:58:23 -07:00
Dianne Hackborn
55946fa9b5 am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp

* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
  People holding partial wake locks now get blamed for CPU usage.
 2010-09-08 14:34:41 -07:00
Jake Hamby
eded617eb4 am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
 2010-09-08 14:34:31 -07:00
Jeff Brown
a4caf30745 am b21fb104: Fix key repeat delay. 
Merge commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp

* commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
  Fix key repeat delay.
 2010-09-08 14:34:26 -07:00
Dianne Hackborn
955566417b Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 2010-09-08 14:15:35 -07:00
Jake Hamby
6cee99c76b Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 2010-09-08 12:49:27 -07:00
Jeff Brown
8a8a4f52ee am de2f3340: Update current.xml for touch filtering feature. 
Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.
 2010-09-08 12:29:49 -07:00
Jeff Brown
61ce3982e1 Fix key repeat delay. 
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
 2010-09-08 12:28:43 -07:00