ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,996 Commits 2 Branches 0 Tags 54 MiB
09a75f337b
Commit Graph

32996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
09a75f337b Merge "Experimental support for changing the video surface/texture on an active mediaplayer" 2011-04-12 09:25:32 -07:00
Andreas Huber
c275555ed3 Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame." 2011-04-12 08:36:59 -07:00
Benoit Goby
d810610fe1 am 0b9b8711: am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '0b9b8711a1a2107dc913cc751b7d981fce4f3082':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:26:41 -07:00
Benoit Goby
77e4ad4610 am 43be7a61: EthernetDataTracker: implement setDependencyMet 
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
  EthernetDataTracker: implement setDependencyMet
 2011-04-11 20:23:42 -07:00
Benoit Goby
9034a564a1 resolved conflicts for merge of 31659471 to master 
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
 2011-04-11 19:07:11 -07:00
Benoit Goby
f3a0fcc94b am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters
 2011-04-11 18:53:57 -07:00
Benoit Goby
29d013afa9 resolved conflicts for merge of 08c39c6a to honeycomb-LTE 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
 2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
904771fc14 am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '07c25b651216daac884bd503c02b788418165b50':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:32:37 -07:00
Xavier Ducrohet
e277418b1d am 1f2a307b: resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
* commit '1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.
 2011-04-11 17:28:59 -07:00
Elliott Hughes
ca24574eec Merge "You don't need to poke around inside FileDescriptor manually." 2011-04-11 17:27:53 -07:00
Brad Fitzpatrick
e80ff06e1c am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit '4430670f48f75661293371dab8db55865f5f56e0':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-11 17:27:12 -07:00
Xavier Ducrohet
f2ab6bc15f resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp 
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
 2011-04-11 17:11:41 -07:00
Xavier Ducrohet
1ab7cfec03 am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
  Merge c5aeac7f from honeycomb.
 2011-04-11 16:33:12 -07:00
Gilles Debunne
0edbcb20ce Merge "Fix in BreakIterator." 2011-04-11 16:21:38 -07:00
Xavier Ducrohet
b5acb8d716 resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp 
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
 2011-04-11 16:15:54 -07:00
Eric Fischer
2d3056e869 Merge "Import revised translations." 2011-04-11 14:36:47 -07:00
Mike Lockwood
362399fd86 am 9e13c7e5: am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak 
* commit '9e13c7e5d787252b2a88aace1115b51a95e16b5d':
  UsbManager: minor Javadoc tweak
 2011-04-11 14:28:34 -07:00
Jason parks
709bbb8887 am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit 'f953d3e2eac2af121e4b83f6bf613e0800fd7952':
  Implement teardown script.
 2011-04-11 14:28:30 -07:00
Jeff Hamilton
ec6a4310d8 am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit 'a83bc160892078c20489897190ee163d5c4d3783':
  Make the NFC UID forward compatible.
 2011-04-11 14:28:27 -07:00
James Dong
49ba1c0c6c am 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 
* commit '6f2b5d614c13fb93f20697bce3bf73176828276d':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
 2011-04-11 14:28:24 -07:00
Mike Lockwood
cdbe0579a5 am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak 
* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
  UsbManager: minor Javadoc tweak
 2011-04-11 14:24:11 -07:00
Jason parks
dd746740c7 am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
  Implement teardown script.
 2011-04-11 14:24:06 -07:00
Jeff Hamilton
3d4cad901c am 7bb236c3: am 84d34078: Make the NFC UID forward compatible. 
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
  Make the NFC UID forward compatible.
 2011-04-11 14:23:59 -07:00
James Dong
eb71e49725 am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
 2011-04-11 14:23:52 -07:00
Jeff Brown
44ee3a7a29 Merge "Add a sprite controller." 2011-04-11 14:10:56 -07:00
Glenn Kasten
34fe4a6166 am a7e8385c: am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit 'a7e8385cb34a19e47fb67bf8f632a8b47503242d':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:49:03 -07:00
Glenn Kasten
fe6844cdd8 am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:46:38 -07:00
Glenn Kasten
2c287e4572 am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2) 
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
  Enable HDCP debugging in Stagefright (1 of 2)
 2011-04-11 12:43:28 -07:00
Amith Yamasani
8ecde812dc Merge "Package manager changes to store and update user information." 2011-04-11 12:14:17 -07:00
Wink Saville
9b999c2260 am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:11:14 -07:00
Wink Saville
2ab253ac63 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:08:19 -07:00
Wink Saville
3cc95585e2 Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 2011-04-11 12:04:47 -07:00
Freeman Ng
46876136ac am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 
* commit '2df36fd6ec39e096327032283d058b48be19e843':
  Add prepaid data services URL to Secure Settings
 2011-04-11 11:30:21 -07:00
Freeman Ng
0428aaa920 am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
  Add prepaid data services URL to Secure Settings
 2011-04-11 11:19:18 -07:00
Freeman Ng
90cd144ad3 Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE 2011-04-11 11:10:18 -07:00
Jason Simmons
23fd895275 Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams." 2011-04-11 10:43:41 -07:00
Wink Saville
98bf8d0abf am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '6e797566650c10ba8655aea914d521f5999073e8':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 08:05:31 -07:00
Wink Saville
4c25818c7d am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
  Cleanup all functions overridden from DCT in GDCT
 2011-04-09 07:57:35 -07:00
Wink Saville
42b6501ff8 Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE 2011-04-09 07:50:37 -07:00
Elliott Hughes
626d865d41 Merge "Tidy up exception throwing in the media native code." 2011-04-08 18:37:01 -07:00
Dianne Hackborn
9c5d5fb4ad Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Jamie Gennis
bcfb78cf5d am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:43:33 -07:00
Jamie Gennis
e2138567d9 am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:41:38 -07:00
Jamie Gennis
f82a9a29d7 am 66380f76: Stagefright: authenticate ANativeWindow. 
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
  Stagefright: authenticate ANativeWindow.
 2011-04-08 17:40:00 -07:00
Robert Greenwalt
acb1c0b91b am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE 
* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
  Make ApnSettings threadsafe.
 2011-04-08 17:23:50 -07:00
Robert Greenwalt
4e3f02dc82 am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE 
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
  Make ApnSettings threadsafe.
 2011-04-08 17:21:43 -07:00
Robert Greenwalt
40ff957b48 Merge "Make ApnSettings threadsafe." into honeycomb-LTE 2011-04-08 17:19:53 -07:00
Joe Onorato
eeb92fa219 Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier." 2011-04-08 17:10:57 -07:00
Robert Greenwalt
bcbd73bb87 am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE 
* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
  Fix getActiveApnTypes for GsmDCT.
 2011-04-08 16:44:42 -07:00
Robert Greenwalt
0dc5550afe am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE 
* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
  Fix notification of disconnected networks.
 2011-04-08 16:44:32 -07:00