ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,057 Commits 2 Branches 0 Tags 54 MiB
d63f92b389
Commit Graph

21057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
cd45cacffa resolved conflicts for merge of ec52c98d to master 
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
 2010-09-09 13:15:32 -07:00
Mike Lockwood
2250a579ec Merge "MTP: Fix support for transfering folders and playlists." 2010-09-09 13:03:11 -07:00
Erik Gilling
e9a02ec207 Merge "surfaceflinger: give hwcomposer a chance to release buffers" 2010-09-09 13:01:27 -07:00
Erik Gilling
3cab73e3a1 Merge "surfaceflinger: composite HWC_SKIP_LAYER layers" 2010-09-09 13:01:23 -07:00
Erik Gilling
0347ec7ecc Merge "surfaceflinger: unlock clients only after flip" 2010-09-09 13:01:18 -07:00
Adam Powell
62f5977c30 Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets" 2010-09-09 12:26:16 -07:00
Gilles Debunne
704d06ee0c am 47fa8e80: Fix for an IndentOutOfBounds in TextField. 
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
 2010-09-09 12:14:59 -07:00
Antti Hatala
f5f2712854 surfaceflinger: give hwcomposer a chance to release buffers 
Change-Id: I605fa779702022865dd58df3b36f37c2644ade36
 2010-09-09 12:06:48 -07:00
Antti Hatala
586a0deb76 surfaceflinger: composite HWC_SKIP_LAYER layers 
Change-Id: I363ede63287ae903d66d0d419343f4ecd81bcc00
 2010-09-09 12:06:31 -07:00
Antti Hatala
8392b504bd surfaceflinger: unlock clients only after flip 
Change-Id: I039291a36f05bbaa02b29325d4012114abd784b9
 2010-09-09 12:06:18 -07:00
Gilles Debunne
dc0174105d am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread 
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
 2010-09-09 12:00:52 -07:00
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
Gilles Debunne
29d6cb8e31 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00
Gilles Debunne
7b780f48f7 Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -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
Romain Guy
1f0ce7c008 Merge "Do not convert 8888 bitmaps to 565 when doing a copy." 2010-09-09 11:52:02 -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
Gilles Debunne
6580031359 Merge "Smart word detection in text selection. Manual merge in HC of 63569." 2010-09-09 10:51:57 -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
Romain Guy
70016d1c35 Merge "A Path can exist in several cache entries." 2010-09-09 10:14:33 -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
Mike Lockwood
efdc975f2f Merge "Add framework resource to specify case sensitivity of the external storage filesystem" 2010-09-09 08:28:53 -07:00
Chia-chi Yeh
cef1523c7a am c2eff4a7: am f6936a3a: Merge "RTP: prevent buffer overflow in AudioRecord." into gingerbread 
Merge commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a'

* commit 'c2eff4a71bd3ab75983ffd029123f10bc177d32a':
  RTP: prevent buffer overflow in AudioRecord.
 2010-09-09 02:44:04 -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
bf88cdf13e am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds. 
Merge commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69'

* commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
  Change the keep-alive interval to 10 seconds.
 2010-09-08 22:47:30 -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
86917696c4 am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp 
Merge commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911'

* commit '0c592acfc0ea298a0cf6c049cce4c5c10974e911':
  Adding Download Manager Integration, stress, and hosts-based tests.
 2010-09-08 20:26:50 -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
e3372bd6f0 am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo
 2010-09-08 19:04:07 -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
b34cd44833 am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'

* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:22:33 -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