summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"Conley Owens2011-04-291-4/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Merge "frameworks/base: acquire lock on am only when needed"Conley Owens2011-04-291-4/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | frameworks/base: acquire lock on am only when neededVairavan Srinivasan2011-02-151-4/+11
* | | | | | | | | | | | | | | | | | | | | | | Merge commit '5eb49e0f' into mConley Owens2011-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in re...Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Adding a sanity test in the while loop in readHistory()Per Andersson2011-02-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of...Conley Owens2011-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag ...Conley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | am c5505f6a: Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-171-13/+19
| | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am 33e86de0: Ignore broken image fix since identical change exists in interna...Conley Owens2011-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Ignore broken image fix since identical change exists in internal treeConley Owens2011-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | am e1b3f15c: Merge "Fixes broken image link in "Tools -> Traceview" documenta...Conley Owens2011-04-291-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | Merge "Fixes broken image link in "Tools -> Traceview" documentation page."Conley Owens2011-04-291-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Fixes broken image link in "Tools -> Traceview" documentation page.Keiji Ariyama2011-02-011-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correc...Stephen Hines2011-04-291-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Fix bug 4355588Jason Sams2011-04-291-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"Gloria Wang2011-04-2918-0/+245
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-2918-0/+245
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollS...Wink Saville2011-04-292-55/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" i...Wink Saville2011-04-292-55/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb...Wink Saville2011-04-292-55/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | CDMALTE: Evaluate data network type in pollStateDone()Kazuhiro Ondo2011-04-292-55/+56
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350...Gloria Wang2011-04-294-17/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-294-17/+26
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documen...Scott Main2011-04-291-13/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for Pr...Scott Main2011-04-291-13/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" in...Scott Main2011-04-291-13/+75
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | | docs: more documentation for ProgressBarScott Main2011-04-291-13/+75
* | | | | | | | | | | | | | | | | | | | | | | | | | | am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return valu...Conley Owens2011-04-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyD...Conley Owens2011-04-291-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am e1787009: Merge "Added null check on return value for getKeyDispatcherStat...Conley Owens2011-04-281-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Added null check on return value for getKeyDispatcherState()"Conley Owens2011-04-281-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Added null check on return value for getKeyDispatcherState()Per Andersson2011-04-281-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap...Conley Owens2011-04-291-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply...Conley Owens2011-04-291-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be nu...Conley Owens2011-04-281-3/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Eliminating dead logic - bitmap state simply cannot be null here."Conley Owens2011-04-281-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Eliminating dead logic - bitmap state simply cannot be null here.Jozef BABJAK2011-04-191-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."Conley Owens2011-04-291-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."Conley Owens2011-04-291-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 11d7ec24: Merge "Removing unnecessary computation."Conley Owens2011-04-281-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Removing unnecessary computation."Conley Owens2011-04-281-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary computation.Jozef BABJAK2011-03-171-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/...Conley Owens2011-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /