summaryrefslogtreecommitdiff
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* Multiple printer discovery session instances and other bugs.Svetoslav2013-09-231-0/+40
* Fix broken method WorkSource.set (names aren't applied).David Christie2013-09-231-1/+0
* Merge "Allow saving to Downloads." into klp-devJeff Sharkey2013-09-232-1/+21
|\
| * Allow saving to Downloads.Jeff Sharkey2013-09-232-1/+21
* | Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-devAmith Yamasani2013-09-233-10/+11
|\ \
| * | Unmarshall PFDs properly when hand-crafting interface stubsAmith Yamasani2013-09-233-10/+11
* | | Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-devDianne Hackborn2013-09-231-31/+275
|\ \ \ | |_|/ |/| |
| * | Issue #10461551: KLP API Review: AppOpsManagerDianne Hackborn2013-09-231-31/+275
* | | Merge "Create unique files, root ordering, UI bugs." into klp-devJeff Sharkey2013-09-221-0/+13
|\ \ \ | |/ / |/| |
| * | Create unique files, root ordering, UI bugs.Jeff Sharkey2013-09-211-0/+13
| |/
* | camera2: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-218-36/+43
* | Merge "camera2: Add capture sequences and capture failures" into klp-devIgor Murashkin2013-09-225-28/+319
|\ \
| * | camera2: Add capture sequences and capture failuresIgor Murashkin2013-09-205-28/+319
* | | Merge commit '53221120' into fix-merge-conflictWink Saville2013-09-211-2/+7
|\ \ \
| * \ \ am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetw...Wink Saville2013-09-211-2/+4
| |\ \ \
| | * \ \ am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
| | |\ \ \
| | | * | | Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
| * | | | | am 788fc628: am 6212f6b3: Merge "Update documentation for speech APIs." into ...Dirk Dougherty2013-09-132-3/+12
| |\| | | |
| | * | | | am 6212f6b3: Merge "Update documentation for speech APIs." into jb-mr2-docsDirk Dougherty2013-09-132-3/+12
| | |\ \ \ \
| | | * \ \ \ Merge "Update documentation for speech APIs." into jb-mr2-docsDirk Dougherty2013-09-142-3/+12
| | | |\ \ \ \
| | | | * | | | Update documentation for speech APIs.Marc Wilson2013-09-132-3/+12
* | | | | | | | Merge "WebView: add an API method to control web contents debugging" into klp...Jonathan Dixon2013-09-213-0/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | WebView: add an API method to control web contents debuggingMikhail Naganov2013-09-113-0/+27
* | | | | | | | | Merge "Update android.print.PrintAttributes documentation" into klp-devSvetoslav Ganov2013-09-211-14/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update android.print.PrintAttributes documentationSvetoslav Ganov2013-09-191-14/+34
* | | | | | | | | | Merge "Fix issue #10807048: Groupon: The application crash when user rotates...Dianne Hackborn2013-09-212-10/+56
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue #10807048: Groupon: The application crash when user rotates...Dianne Hackborn2013-09-202-10/+56
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Offer to enable a print service after it is installed." into klp-devSvetoslav2013-09-211-82/+102
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Offer to enable a print service after it is installed.Svetoslav2013-09-201-82/+102
* | | | | | | | | | Merge "Fix for "Can't place cursor after combining accent"" into klp-devRaph Levien2013-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for "Can't place cursor after combining accent"Raph Levien2013-09-201-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "camera2: Add more camera device states, make #openCamera async." into ...Igor Murashkin2013-09-204-81/+348
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | camera2: Add more camera device states, make #openCamera async.Igor Murashkin2013-09-194-81/+348
| |/ / / / / / / / /
* | | | | | | | | | Merge "Ensure access to the map of geofence callbacks is synchronized in all ...destradaa2013-09-201-8/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure access to the map of geofence callbacks is synchronized in all casesdestradaa2013-09-201-8/+6
* | | | | | | | | | | Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-devAdam Lesinski2013-09-203-29/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Surfaces ParcelFileDescriptor#parseMode() as APIAdam Lesinski2013-09-203-29/+35
* | | | | | | | | | | | Merge "Delegate mkdirs() to vold when lacking perms." into klp-devJeff Sharkey2013-09-203-28/+98
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Delegate mkdirs() to vold when lacking perms.Jeff Sharkey2013-09-203-28/+98
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Clear names from externally supplied WorkSources to WifiManager (b/107...David Christie2013-09-201-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Clear names from externally supplied WorkSources to WifiManager (b/10733757)David Christie2013-09-201-1/+15
* | | | | | | | | | | | Merge "Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest"...Dianne Hackborn2013-09-201-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTestDianne Hackborn2013-09-201-1/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Add equals() and hashcode() to SpannableString" into klp-devChet Haase2013-09-203-0/+89
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add equals() and hashcode() to SpannableStringChet Haase2013-09-193-0/+89
* | | | | | | | | | | | | Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-devAdam Lesinski2013-09-201-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Ensures that CompatibilityInfo is always set in ResourcesAdam Lesinski2013-09-201-12/+13
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Add camera affordance to navigation bar on phones" into klp-devJim Miller2013-09-201-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add camera affordance to navigation bar on phonesJim Miller2013-09-191-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Move PdfDocument to android.graphics.pdf" into klp-devSvetoslav2013-09-204-497/+80
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |