Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" | Conley Owens | 2011-04-29 | 1 | -4/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge "frameworks/base: acquire lock on am only when needed" | Conley Owens | 2011-04-29 | 1 | -4/+11 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | frameworks/base: acquire lock on am only when needed | Vairavan Srinivasan | 2011-02-15 | 1 | -4/+11 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5eb49e0f' into m | Conley Owens | 2011-05-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in re... | Conley Owens | 2011-04-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" | Conley Owens | 2011-04-29 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Merge "Adding a sanity test in the while loop in readHistory()" | Conley Owens | 2011-04-29 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | Adding a sanity test in the while loop in readHistory() | Per Andersson | 2011-02-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of... | Conley Owens | 2011-04-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag ... | Conley Owens | 2011-04-29 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" | Conley Owens | 2011-04-29 | 1 | -13/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Improved conversion accuracy of exif geotag data" | Conley Owens | 2011-04-29 | 1 | -13/+19 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Improved conversion accuracy of exif geotag data | Oscar Rydhe | 2011-01-17 | 1 | -13/+19 | |
| | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | am 33e86de0: Ignore broken image fix since identical change exists in interna... | Conley Owens | 2011-04-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Ignore broken image fix since identical change exists in internal tree | Conley Owens | 2011-04-29 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | am e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documenta... | Conley Owens | 2011-04-29 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge "Fixes broken image link in "Tools -> Traceview" documentation page." | Conley Owens | 2011-04-29 | 1 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | Fixes broken image link in "Tools -> Traceview" documentation page. | Keiji Ariyama | 2011-02-01 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correc... | Stephen Hines | 2011-04-29 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Fix bug 4355588 | Jason Sams | 2011-04-29 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" | Gloria Wang | 2011-04-29 | 18 | -0/+245 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Add setParameter/getParameter to MediaPlayer API. | Gloria Wang | 2011-04-29 | 18 | -0/+245 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollS... | Wink Saville | 2011-04-29 | 2 | -55/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" i... | Wink Saville | 2011-04-29 | 2 | -55/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb... | Wink Saville | 2011-04-29 | 2 | -55/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | CDMALTE: Evaluate data network type in pollStateDone() | Kazuhiro Ondo | 2011-04-29 | 2 | -55/+56 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350... | Gloria Wang | 2011-04-29 | 4 | -17/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Add DRM errors in the DRM frameworks to MediaErrors also. | Gloria Wang | 2011-04-29 | 4 | -17/+26 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documen... | Scott Main | 2011-04-29 | 1 | -13/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for Pr... | Scott Main | 2011-04-29 | 1 | -13/+75 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" in... | Scott Main | 2011-04-29 | 1 | -13/+75 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb | Scott Main | 2011-04-29 | 1 | -13/+75 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "docs: more documentation for ProgressBar" into honeycomb | Scott Main | 2011-04-29 | 1 | -13/+75 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | docs: more documentation for ProgressBar | Scott Main | 2011-04-29 | 1 | -13/+75 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return valu... | Conley Owens | 2011-04-29 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyD... | Conley Owens | 2011-04-29 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am e1787009: Merge "Added null check on return value for getKeyDispatcherStat... | Conley Owens | 2011-04-28 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Added null check on return value for getKeyDispatcherState()" | Conley Owens | 2011-04-28 | 1 | -0/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Added null check on return value for getKeyDispatcherState() | Per Andersson | 2011-04-28 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap... | Conley Owens | 2011-04-29 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply... | Conley Owens | 2011-04-29 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be nu... | Conley Owens | 2011-04-28 | 1 | -3/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Eliminating dead logic - bitmap state simply cannot be null here." | Conley Owens | 2011-04-28 | 1 | -3/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Eliminating dead logic - bitmap state simply cannot be null here. | Jozef BABJAK | 2011-04-19 | 1 | -3/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." | Conley Owens | 2011-04-29 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." | Conley Owens | 2011-04-29 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 11d7ec24: Merge "Removing unnecessary computation." | Conley Owens | 2011-04-28 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Removing unnecessary computation." | Conley Owens | 2011-04-28 | 1 | -1/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary computation. | Jozef BABJAK | 2011-03-17 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/... | Conley Owens | 2011-04-29 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |