summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.javaJohn Spurlock2014-02-191-6/+6
|\
| * am 99873565: am ba231fca: Fix bad @links in PendingIntent.javaJohn Spurlock2014-02-191-6/+6
| |\
| | * am ba231fca: Fix bad @links in PendingIntent.javaJohn Spurlock2014-02-191-6/+6
| | |\
| | | * Fix bad @links in PendingIntent.javaJohn Spurlock2014-02-181-6/+6
* | | | Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-devCraig Mautner2014-02-181-10/+51
|\ \ \ \
| * | | | Allow "opaque" flag to be updated. DO NOT MERGEAndy McFadden2014-02-181-10/+51
* | | | | Create FEATURE_ constants for print and backupAdam Lesinski2014-02-181-0/+14
|/ / / /
* | | | Refactor dream manager to new pattern.Jeff Brown2014-02-131-0/+39
* | | | Improve error handling in listener services.John Spurlock2014-02-121-0/+11
* | | | Add support for injecting events into ActivityContainers. (DO NOT MERGE)Jeff Brown2014-02-113-0/+31
* | | | Add local-only option to Notification (using flag)Griff Hazen2014-02-111-2/+19
* | | | Fix ActivityView layout bug.Griff Hazen2014-02-101-1/+1
* | | | Queue startActivity params if not yet ready.Craig Mautner2014-02-071-12/+35
* | | | Add IIntentSender to ActivityContainer.startActivityCraig Mautner2014-02-042-24/+55
* | | | am 647db9fa: am 76ecd66a: am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
|\ \ \ \ | |/ / /
| * | | am 76ecd66a: am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| |\ \ \ | | |/ /
| | * | am 0196e561: Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
| | |\ \ | | | |/
| | | * Fix typo in ImageView.javaJohn Spurlock2014-02-031-1/+1
* | | | Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-devCraig Mautner2014-01-311-0/+5
|\ \ \ \
| * | | | Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usageCraig Mautner2014-01-311-0/+5
* | | | | Merge "Add proxy as another network." into klp-modular-devHui Lu2014-01-302-2/+132
|\ \ \ \ \
| * | | | | Add proxy as another network.Hui Lu2014-01-302-2/+132
* | | | | | am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Bind...Narayan Kamath2014-01-292-46/+51
|\ \ \ \ \ \
| * \ \ \ \ \ am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel...Narayan Kamath2014-01-292-46/+51
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compa...Narayan Kamath2014-01-292-46/+51
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "AArch64: Make Binder and Parcel 64-bit compatible"Narayan Kamath2014-01-292-46/+51
| | | |\ \ \ \ \
| | | | * | | | | AArch64: Make Binder and Parcel 64-bit compatibleAshok Bhat2014-01-232-46/+51
* | | | | | | | | Merge "BluetoothInputJava: Add broadcast action REPORT" into klp-modular-devMike J. Chen2014-01-281-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | BluetoothInputJava: Add broadcast action REPORTMike J. Chen2014-01-271-0/+6
* | | | | | | | | | am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make grap...Narayan Kamath2014-01-2810-242/+242
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes ...Narayan Kamath2014-01-2810-242/+242
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat...Narayan Kamath2014-01-2810-242/+242
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-2810-242/+242
* | | | | | | | | | Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" into klp-modu...Mike J. Chen2014-01-281-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | BluetoothInputDevice: make REPORT_TYPE values match halMike J. Chen2014-01-271-3/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Fix NPE in deleteDatabase()." into klp-modular-devJeff Brown2014-01-281-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix NPE in deleteDatabase().Jeff Brown2014-01-241-4/+6
* | | | | | | | | | Merge "Hide an old debug function." into klp-modular-devJeff Brown2014-01-281-10/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Hide an old debug function.Jeff Brown2014-01-241-10/+6
| |/ / / / / / / /
* | | | | | | | | am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race conditi...Christopher Tate2014-01-271-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner...Christopher Tate2014-01-271-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup ...Christopher Tate2014-01-271-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fixed race condition in Spinner.DialogPopup on null reference."Christopher Tate2014-01-271-2/+4
| | | |\ \ \ \ \
| | | | * | | | | Fixed race condition in Spinner.DialogPopup on null reference.Daniel 2 Olofsson2013-07-121-2/+4
* | | | | | | | | am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused fiel...Narayan Kamath2014-01-241-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetM...Narayan Kamath2014-01-241-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager."Narayan Kamath2014-01-241-1/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Remove unused field from AssetManager.Narayan Kamath2014-01-221-1/+0
| | | | |/ / / / | | | |/| | | |
* | | | | | | | am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding fre...Selim Gurun2014-01-232-14/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTes...Selim Gurun2014-01-232-14/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /