summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | Add more checks for bad values to protect from corrupt files.Dianne Hackborn2010-12-091-6/+22
| | | * | | | | | | | | | | | Grant ACCESS_ALL_DOWNLOADS to DefaultContainerServiceKenny Root2010-12-092-1/+9
* | | | | | | | | | | | | | | Merge "API CHANGE - Add hasGrantedPolicy() API"Andy Stadler2010-12-094-15/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | API CHANGE - Add hasGrantedPolicy() APIAndy Stadler2010-12-094-15/+80
* | | | | | | | | | | | | | | | Merge "Fix not saving state when restarting an activity."Dianne Hackborn2010-12-091-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix not saving state when restarting an activity.Dianne Hackborn2010-12-091-7/+6
* | | | | | | | | | | | | | | | Merge "Rehide the PTP content provider interface from the public API."Mike Lockwood2010-12-092-462/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rehide the PTP content provider interface from the public API.Mike Lockwood2010-12-092-462/+2
* | | | | | | | | | | | | | | | Merge "Change the initial visibility of IME switch button"satok2010-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Change the initial visibility of IME switch buttonsatok2010-12-101-1/+1
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Make CookieManager.removeSessionCookies async"Kristian Monsen2010-12-092-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make CookieManager.removeSessionCookies asyncKristian Monsen2010-12-092-1/+33
* | | | | | | | | | | | | | | Merge "Move the breadcrumbs to the right pane."Amith Yamasani2010-12-097-30/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move the breadcrumbs to the right pane.Amith Yamasani2010-12-087-30/+97
* | | | | | | | | | | | | | | Fix buildJason Sams2010-12-091-2/+2
* | | | | | | | | | | | | | | Merge "Allocation API update."Jason Sams2010-12-0828-524/+398
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Allocation API update.Jason Sams2010-12-0828-524/+398
* | | | | | | | | | | | | | am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Rele...Wink Saville2010-12-081-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock ...Wink Saville2010-12-081-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL reques...Wink Saville2010-12-081-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "frameworks/base/telephony: Release wakelock on RIL request send error"Wink Saville2010-12-081-0/+11
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | | * | | | | | | | | frameworks/base/telephony: Release wakelock on RIL request send errorAnshul Jain2010-12-081-0/+11
* | | | | | | | | | | | | Added some pieces for Wallpaper previewsAdam Cohen2010-12-084-2/+43
* | | | | | | | | | | | | Merge "Make doclava happy by returning the same type in old and new APIs."Jesse Wilson2010-12-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make doclava happy by returning the same type in old and new APIs.Jesse Wilson2010-12-081-1/+1
* | | | | | | | | | | | | | Merge "New, better line drawing implementation. Bug #3207544 Bug #3225875"Romain Guy2010-12-086-180/+235
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | New, better line drawing implementation.Romain Guy2010-12-086-180/+235
* | | | | | | | | | | | | | | Merge "service_manager: duplicate registrations override previous ones"Iliyan Malchev2010-12-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | service_manager: duplicate registrations override previous onesIliyan Malchev2010-12-081-2/+2
* | | | | | | | | | | | | | | | Merge "Fix a regression in clearMetaKeyState."Jeff Brown2010-12-081-7/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix a regression in clearMetaKeyState.Jeff Brown2010-12-081-7/+3
* | | | | | | | | | | | | | | | Merge "Update API with latest parameter names and getClass() return type."Jesse Wilson2010-12-081-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update API with latest parameter names and getClass() return type.Jesse Wilson2010-12-081-18/+18
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Improve shortcut handling."Jeff Brown2010-12-082-16/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Improve shortcut handling.Jeff Brown2010-12-082-16/+40
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "[3211070] camera preview image is rendered offset from the UI overlay ...Mathias Agopian2010-12-081-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | [3211070] camera preview image is rendered offset from the UI overlay frameMathias Agopian2010-12-081-5/+12
* | | | | | | | | | | | | | | | fix build.Mathias Agopian2010-12-081-13/+7
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "fix [3260137] Sometimes front-facing camera mirroring is wrong"Mathias Agopian2010-12-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix [3260137] Sometimes front-facing camera mirroring is wrongMathias Agopian2010-12-081-1/+2
* | | | | | | | | | | | | | | | am 054ae782: am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes...Mathias Agopian2010-12-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQu...Mathias Agopian2010-12-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on G...Mathias Agopian2010-12-081-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/CrespoMathias Agopian2010-12-081-2/+2
* | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of c402def7 to master"James Dong2010-12-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | resolved conflicts for merge of c402def7 to masterJames Dong2010-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the render...James Dong2010-12-081-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initia...James Dong2010-12-081-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, ...James Dong2010-12-081-0/+2
* | | | | | | | | | | | | | | | | | | Merge changes Id4222c9b,I3c1a9172Mathias Agopian2010-12-0810-991/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \