summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Add unit tests for InputMethodSubtypeSwitchingControllerYohei Yukawa2014-05-014-40/+257
* Merge "Add missing ifdefs"John Reck2014-05-012-0/+10
|\
| * Add missing ifdefsJohn Reck2014-04-302-0/+10
* | am 006c2110: am 11b715da: Merge "Make touch slop region smaller for watch" in...Mindy Pereira2014-04-301-1/+4
|\ \
| * \ am 11b715da: Merge "Make touch slop region smaller for watch" into klp-modula...Mindy Pereira2014-04-301-1/+4
| |\ \
| | * | Make touch slop region smaller for watchMindy Pereira2014-04-301-1/+4
* | | | am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL poin...Michael Wright2014-04-301-0/+4
|\ \ \ \ | |/ / /
| * | | am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for...Michael Wright2014-04-301-0/+4
| |\ \ \
| | * \ \ am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSe...Michael Wright2014-04-301-0/+4
| | |\ \ \
| | | * \ \ Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperInt...Michael Wright2014-04-301-0/+4
| | | |\ \ \
| | | | * | | WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntentAllen Shen2014-04-301-0/+4
* | | | | | | am f84493ec: am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJp...Elliott Hughes2014-04-301-5/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 91ff3c18: am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Fix for native leaks in YuvToJpegEncoder.cpp"Elliott Hughes2014-04-301-5/+6
| | | |\ \ \ \
| | | | * | | | Fix for native leaks in YuvToJpegEncoder.cppPawel Augustyn2014-02-041-5/+6
| | | * | | | | DO NOT MERGE Add invokeFunctor stubBo Liu2014-04-291-0/+5
| | | | |/ / / | | | |/| | |
| * | | | | | am 9a76e9ba: Fix build errorBill Yi2014-04-301-2/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix build errorBill Yi2014-04-291-2/+5
| | * | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-29163-904/+1408
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...Eino-Ville Talvala2014-03-251-4/+26
| | | |\ \ \ \
| | | * \ \ \ \ am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"Kenny Root2014-03-254-34/+387
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."Narayan Kamath2014-03-251-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...Gabriel Peal2014-03-221-0/+31
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceF...Chad Brubaker2014-03-211-1/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-devUnsuk Jung2014-03-211-64/+2
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParam...Alex Klyubin2014-03-211-2/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into...Jeff Sharkey2014-03-211-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am a6454ccb: am 49325305: Merge "Update contextual asset bar assets to avoid ...Adam Powell2014-03-214-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to sat...Vinit Deshapnde2014-03-202-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co...Wei Wang2014-03-201-5/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start...Wei Wang2014-03-204-69/+131
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2:...Victoria Lease2014-03-201-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothin...Narayan Kamath2014-03-201-11/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTo...Jeff Brown2014-03-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on da...Robert Greenwalt2014-03-191-0/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9a7eeba: am 4cb1bc28: Merge "Refresh cast icon assets to improve visual c...Jeff Brown2014-03-1964-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp...Xia Wang2014-03-181-13/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2133079: am 7c0dfed5: Merge "Pass int32_t for JNI calls to java Input/Out...Narayan Kamath2014-03-181-7/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"Jeff Sharkey2014-03-172-1/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"Dave Allison2014-03-141-23/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodMan...Yohei Yukawa2014-03-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into kl...John Spurlock2014-03-141-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP ...JP Abgrall2014-03-141-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" int...Chad Brubaker2014-03-141-3/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to...Svetoslav2014-03-141-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 825dd9dd to klp-dev-plus-aospJeff Brown2014-03-133-163/+129
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#...Adam Powell2014-03-143-6/+42
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidR...Narayan Kamath2014-03-131-7/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."Narayan Kamath2014-03-131-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \