summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build: Revert "Properly set up local transport data dirs after an ...Ed Heyl2015-03-131-9/+7
|\
| * Fix build: Revert "Properly set up local transport data dirs after an initial...Ed Heyl2015-03-131-9/+7
* | Merge "Properly set up local transport data dirs after an initialize operation"Christopher Tate2015-03-131-7/+9
|\ \ | |/
| * Properly set up local transport data dirs after an initialize operationChristopher Tate2015-03-121-7/+9
* | Merge "Avoid rebuilding epoll set when PFD status report is done."Jeff Brown2015-03-131-3/+4
|\ \
| * | Avoid rebuilding epoll set when PFD status report is done.Jeff Brown2015-03-121-3/+4
* | | Merge "Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O."""Jeff Brown2015-03-131-39/+31
|\ \ \ | |/ /
| * | Revert "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""Jeff Brown2015-03-121-39/+31
* | | am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."Nick Kralevich2015-03-131-28/+0
|\ \ \
| * \ \ am 30fcd2aa: Merge "Drop unusable SELinux APIs."Nick Kralevich2015-03-131-28/+0
| |\ \ \
| | * | | Drop unusable SELinux APIs.Stephen Smalley2015-03-131-28/+0
* | | | | Merge "Start moving text measurement into native code"Raph Levien2015-03-134-29/+99
|\ \ \ \ \
| * | | | | Start moving text measurement into native codeRaph Levien2015-03-134-29/+99
* | | | | | Merge "More work on collecting assist data."Dianne Hackborn2015-03-1321-101/+593
|\ \ \ \ \ \
| * | | | | | More work on collecting assist data.Dianne Hackborn2015-03-1221-101/+593
* | | | | | | Merge "Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN"Benjamin Franz2015-03-131-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_INBenjamin Franz2015-03-131-0/+3
* | | | | | | | Merge "Do not hide any call log entries when they are added."Santos Cordon2015-03-131-8/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not hide any call log entries when they are added.Santos Cordon2015-03-121-8/+0
| |/ / / / / / /
* | | | | | | | Merge "Expose isSystemImeThatHasSubtypeOf to Settings"Yohei Yukawa2015-03-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose isSystemImeThatHasSubtypeOf to SettingsYohei Yukawa2015-03-131-1/+1
* | | | | | | | | Support a Primary and a Floating ActionMode in DecorView.Clara Bayarri2015-03-131-63/+81
* | | | | | | | | Add a type parameter to startActionMode() calls.Clara Bayarri2015-03-1314-132/+374
* | | | | | | | | resolved conflicts for merge of b6b9fe21 to masterAndreas Gampe2015-03-137-1904/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."Lorenzo Colitti2015-03-127-1908/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Remove dead code, mostly DataStateTracker."Lorenzo Colitti2015-03-127-1908/+0
| | |\ \ \ \ \ \
| | | * | | | | | Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-117-1908/+0
| * | | | | | | | am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"Andreas Gampe2015-03-112-0/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Extracted a separate class to run dexopt on packagesFyodor Kupolov2015-03-112-0/+14
* | | | | | | | | Merge "NetworkStatsService to adjust VPN stats before recording."Wenchao Tong2015-03-133-0/+91
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NetworkStatsService to adjust VPN stats before recording.Wenchao Tong2015-03-123-0/+91
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Add API for WebView OffscreenPreRaster setting."Hui Shu2015-03-131-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add API for WebView OffscreenPreRaster setting.Hui Shu2015-03-121-0/+21
* | | | | | | | | | resolved conflicts for merge of 42f55d1e to masterMarco Nelissen2015-03-121-3/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am a3d25d74: Merge "Fix context leak"Marco Nelissen2015-03-111-3/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix context leakMarco Nelissen2015-03-111-3/+8
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge "NetworkStats to support VPN accounting."Wenchao Tong2015-03-121-0/+160
|\ \ \ \ \ \ \ \
| * | | | | | | | NetworkStats to support VPN accounting.Wenchao Tong2015-03-091-0/+160
* | | | | | | | | Merge "Fix negative touch word offset that caused crashing when selecting text"Roozbeh Pournader2015-03-121-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix negative touch word offset that caused crashing when selecting textMady Mellor2015-03-121-2/+2
* | | | | | | | | | Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O.""Jeff Brown2015-03-121-31/+39
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Revert "Update ParcelFileDescriptor to use non-blocking I/O."Jeff Brown2015-03-121-31/+39
* | | | | | | | | | Merge "Camera: add @hide API for setting camera rotation"Yin-Chia Yeh2015-03-123-2/+150
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Camera: add @hide API for setting camera rotationYin-Chia Yeh2015-03-103-2/+150
* | | | | | | | | | Merge "Allow polling for WindowInsets."Filip Gruszczynski2015-03-122-6/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow polling for WindowInsets.Filip Gruszczynski2015-03-112-6/+42
* | | | | | | | | | | Move the "Replace" popup option to the Text Selection ActionMode.Clara Bayarri2015-03-122-4/+19
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge "Add rename support to FingerprintManager"Jim Miller2015-03-122-2/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add rename support to FingerprintManagerJim Miller2015-03-112-2/+24
* | | | | | | | | | Update ParcelFileDescriptor to use non-blocking I/O.Jeff Brown2015-03-111-39/+31