ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,851 Commits 2 Branches 0 Tags 54 MiB
9609a82a45
Commit Graph

17851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
c22873a08c Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread 2010-08-25 15:35:53 -07:00
Mathias Agopian
7cd54c14b2 Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread 2010-08-25 15:25:32 -07:00
Brad Fitzpatrick
c54dd7763f am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread 
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp

* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
  Start of SharedPreferences$Editor.startCommit()
 2010-08-25 15:19:57 -07:00
Brad Fitzpatrick
80344d13ed Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-25 15:15:30 -07:00
Eric Laurent
13f956f666 am c14f9ca6: Merge "Added preset reverb." into gingerbread 
Merge commit 'c14f9ca6e5e795b641e7809786b4e51e13493907' into gingerbread-plus-aosp

* commit 'c14f9ca6e5e795b641e7809786b4e51e13493907':
  Added preset reverb.
 2010-08-25 15:11:30 -07:00
Mathias Agopian
eff062c49e fix [2946787] Screen flicker on low resolution setting in camcorder. 
Change-Id: I7e86f2b6d85dcae8dd212890b978fa6ac7de6893
 2010-08-25 15:09:52 -07:00
Eric Laurent
b27990fd4b Merge "Added preset reverb." into gingerbread 2010-08-25 15:09:10 -07:00
Andreas Huber
119088ccd2 am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp

* commit '235840228b0692b66d854ff499b5c4060f883e03':
  Ensure that buffering updates eventually hit 100% after we download everything.
 2010-08-25 15:01:45 -07:00
Andreas Huber
fc48cc9e68 Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread 2010-08-25 14:54:36 -07:00
Cary Clark
7264fd1de9 am d64f4a98: DO NOT MERGE fix null check 
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
 2010-08-25 13:53:05 -07:00
Andreas Huber
6d35200277 am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp

* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
  Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
 2010-08-25 13:13:57 -07:00
Andreas Huber
62c6ce2e71 Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread 2010-08-25 13:10:04 -07:00
Mathias Agopian
2091772e7c am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread 
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
  don't try to lock a buffer that wasn't allocated with SW usage bits
 2010-08-25 12:17:19 -07:00
Mathias Agopian
150bd0b2d7 Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread 2010-08-25 12:15:38 -07:00
Mathias Agopian
f1b38247d4 don't try to lock a buffer that wasn't allocated with SW usage bits 
Change-Id: Iabbcec1bfa30dc47d45ece699dd178653f1b675b
 2010-08-25 12:14:27 -07:00
Brian Carlstrom
6f56b21aed am 4d672988: Merge "Remove "StringTest.java"." into gingerbread 
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
 2010-08-25 11:04:26 -07:00
Brian Carlstrom
9730e61a6d Merge "Remove "StringTest.java"." into gingerbread 2010-08-25 11:02:22 -07:00
Brian Carlstrom
e58ed82d44 am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread 
Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp

* commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
  Update AndroidRuntime with dalvik-dev changes
 2010-08-25 10:55:47 -07:00
Brian Carlstrom
d61798d7ae Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread 2010-08-25 10:53:10 -07:00
Eric Laurent
3734308dd5 am 67b50606: Merge "Fix the simulator build." into gingerbread 
Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.
 2010-08-25 10:39:21 -07:00
Eric Laurent
944d8e92c4 Merge "Fix the simulator build." into gingerbread 2010-08-25 10:37:27 -07:00
Jean-Baptiste Queru
19e9ecc8a2 am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant 
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp

* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
  Make the default backup configuration "disabled; local transport selected"
 2010-08-25 10:18:14 -07:00
Jean-Baptiste Queru
1c07fd511d am d5e601c2: reconcile open-source froyo into google variant 
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread

* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
  Make the default backup configuration "disabled; local transport selected"
 2010-08-25 10:15:38 -07:00
Brian Carlstrom
caaf169168 am 59073b15: Merge "Fix linux 64 build" into gingerbread 
Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build
 2010-08-25 10:07:18 -07:00
Jean-Baptiste Queru
c1ee89ac9c reconcile open-source froyo into google variant 
Change-Id: Idfacbf98a6c98176620f252504213d01bbd49eb9
 2010-08-25 09:40:59 -07:00
Brian Carlstrom
fd30cf4f96 Merge "Fix linux 64 build" into gingerbread 2010-08-25 09:28:00 -07:00
Chih-Chung Chang
55d979bc0d am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread 
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
 2010-08-25 00:09:22 -07:00
Chih-Chung Chang
20f8ea43a3 Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread 2010-08-25 00:07:23 -07:00
Hung-ying Tyan
763e7688a1 am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread 
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp

* commit '37f709aeb0424948a8f69577c6fad39dc95d7733':
  SipProfile: add isOutgoingCallAllowed() and new builder constructor
 2010-08-24 23:59:28 -07:00
Hung-ying Tyan
7a84ed62a8 Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread 2010-08-24 23:57:50 -07:00
Rohit Mungee
62f83874a4 am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread 
Merge commit 'bfc9325f8981173db51bc46af0e762dad1341671' into gingerbread-plus-aosp

* commit 'bfc9325f8981173db51bc46af0e762dad1341671':
  Add support for generated documentation as part of the SDK docs.
 2010-08-24 23:03:32 -07:00
Rohit Mungee
6d4d8c5115 Merge "Add support for generated documentation as part of the SDK docs." into gingerbread 2010-08-24 22:59:41 -07:00
Daisuke Miyakawa
b4b73968bc am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread 
Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp

* commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab':
  Fix the test breakage in vCard tests.
 2010-08-24 18:31:22 -07:00
Daisuke Miyakawa
391adbe13d Merge "Fix the test breakage in vCard tests." into gingerbread 2010-08-24 18:29:24 -07:00
Christopher Tate
71d9781fc6 am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo 
Merge commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1' into gingerbread-plus-aosp

* commit '2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1':
  Make the default backup configuration "disabled; local transport selected"
 2010-08-24 18:23:56 -07:00
Christopher Tate
2a7b3ebb99 am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo 
Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread

* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
  Make the default backup configuration "disabled; local transport selected"
 2010-08-24 18:21:39 -07:00
Brad Fitzpatrick
365d986487 am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread 
Merge commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a' into gingerbread-plus-aosp

* commit 'bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a':
  Negatively cache settings and proactively slurp settings into cache.
 2010-08-24 18:14:10 -07:00
Brad Fitzpatrick
d11bc2f33a Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread 2010-08-24 18:10:36 -07:00
Christopher Tate
b37cb69fe3 Merge "Make the default backup configuration "disabled; local transport selected"" into froyo 2010-08-24 18:05:09 -07:00
Mathias Agopian
95acdcc7de am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread 
Merge commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp

* commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
  fix [2931513] Add support for setting the orientation of an ANativeWindow
 2010-08-24 16:28:57 -07:00
Mathias Agopian
a85cdcc130 Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread 2010-08-24 16:23:12 -07:00
Mathias Agopian
b661d66013 fix [2931513] Add support for setting the orientation of an ANativeWindow 
Also implement support for cropping.

Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
 2010-08-24 15:40:50 -07:00
Andreas Huber
6cfd881e4d am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 
Merge commit '6b6ae996b2e84af030397cff3a7f0087de93e01c' into gingerbread-plus-aosp

* commit '6b6ae996b2e84af030397cff3a7f0087de93e01c':
  A first shot at proper support for seeking of rtsp streams.
 2010-08-24 15:06:31 -07:00
Andreas Huber
3087ca8681 Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread 2010-08-24 15:01:14 -07:00
Dianne Hackborn
ab07f8103f am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread 
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
 2010-08-24 14:47:46 -07:00
Dianne Hackborn
6f4b2fbdb9 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Gilles Debunne
dea27daeab am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread 
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
 2010-08-24 14:25:57 -07:00
Gilles Debunne
734f574e81 Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Brad Fitzpatrick
016a98d8f2 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread 
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
 2010-08-24 14:18:26 -07:00
Brad Fitzpatrick
85e027d237 Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00