summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Begin moving VPN to NetworkStateTracker pattern.Jeff Sharkey2012-08-234-3/+189
* Merge "Iteration on multi-user external storage." into jb-mr1-devJeff Sharkey2012-08-222-5/+1
|\
| * Iteration on multi-user external storage.Jeff Sharkey2012-08-222-5/+1
* | Merge "Eliminate special battery calls by WindowManager" into jb-mr1-devCraig Mautner2012-08-221-7/+0
|\ \
| * | Eliminate special battery calls by WindowManagerCraig Mautner2012-08-221-7/+0
* | | am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac addr...Irfan Sheriff2012-08-221-3/+5
|\ \ \
| * \ \ am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"Irfan Sheriff2012-08-221-3/+5
| |\ \ \
| | * | | Avoid system_server crashing due to mac address is nullChih-Wei Huang2012-08-221-3/+5
* | | | | Merge "Remove permission requirement for some UserManager calls" into jb-mr1-devAmith Yamasani2012-08-221-0/+9
|\ \ \ \ \
| * | | | | Remove permission requirement for some UserManager callsAmith Yamasani2012-08-221-0/+9
* | | | | | Merge "Fix onFindResultReceived API" into jb-mr1-devSelim Gurun2012-08-221-2/+2
|\ \ \ \ \ \
| * | | | | | Fix onFindResultReceived APISelim Gurun2012-08-211-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Make the screen brightness setting limits configurable." into jb-mr1-devJeff Brown2012-08-211-10/+5
|\ \ \ \ \ \
| * | | | | | Make the screen brightness setting limits configurable.Jeff Brown2012-08-211-10/+5
* | | | | | | Merge "Add FloatMath.pow." into jb-mr1-devJeff Brown2012-08-211-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Add FloatMath.pow.Jeff Brown2012-08-211-0/+10
* | | | | | Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-devSelim Gurun2012-08-213-14/+8
|\ \ \ \ \ \
| * | | | | | Small tidy up to getDefaultUserAgent. DO NOT MERGEJonathan Dixon2012-08-213-14/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT ...Selim Gurun2012-08-212-31/+16
|\ \ \ \ \ \
| * | | | | | Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGEMikhail Naganov2012-08-212-31/+16
| |/ / / / /
* | | | | | am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate han...Dianne Hackborn2012-08-211-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reu...Dianne Hackborn2012-08-211-3/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"Dianne Hackborn2012-08-211-3/+4
| | |\ \ \
| | | * | | ActivityThread: Avoid creating duplicate handlers and reuse mHVairavan Srinivasan2012-08-181-3/+4
* | | | | | Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-...Jim Miller2012-08-213-70/+101
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update AppWidgetHost with better support for OnClickHandlersJim Miller2012-08-203-70/+101
* | | | | | Merge "Improve multi-user app management." into jb-mr1-devDianne Hackborn2012-08-215-22/+73
|\ \ \ \ \ \
| * | | | | | Improve multi-user app management.Dianne Hackborn2012-08-215-22/+73
* | | | | | | Merge "Encapsulate locks in UEventObservers." into jb-mr1-devJeff Brown2012-08-201-84/+112
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Encapsulate locks in UEventObservers.Jeff Brown2012-08-201-84/+112
* | | | | | | Merge "Add factory test feature to shut off on long press power." into jb-mr1...Jeff Brown2012-08-202-2/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add factory test feature to shut off on long press power.Jeff Brown2012-08-202-2/+37
* | | | | | | Merge "Support scrolling layers with the mousewheel" into jb-mr1-devJohn Reck2012-08-201-3/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Support scrolling layers with the mousewheelJohn Reck2012-08-201-3/+7
| |/ / / / /
* | | | | | Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-203-0/+6
|\ \ \ \ \ \
| * | | | | | add wireless charger supportBrian Muramatsu2012-08-203-0/+6
* | | | | | | resolved conflicts for merge of 4ea6a8eb to jb-mr1-devJean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \ \
| | | * | | | | Switch widget: Fix ON/OFF option update errorYu Haonong2012-07-181-1/+1
* | | | | | | | Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-devBenoit Goby2012-08-201-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Add UsbDebuggingManager and UsbDebuggingActivityBenoit Goby2012-08-201-0/+8
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Pass URLs to package verifiers" into jb-mr1-devrich cannings2012-08-206-8/+264
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass URLs to package verifiersrich cannings2012-08-206-8/+264
* | | | | | | | | Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-devKenny Root2012-08-201-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add AndroidKeyStore provider for KeyStore APIKenny Root2012-08-201-0/+4
* | | | | | | | | | Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-devGeorge Mount2012-08-205-3/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add getDefaultUserAgent to WebSettings.George Mount2012-08-175-3/+48
* | | | | | | | | | | DO NOT MERGE LocaleSpan makes Han disambiguation easy!Victoria Lease2012-08-203-0/+112
* | | | | | | | | | | am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"Kenny Root2012-08-202-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |