summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera2: validate reprocess request's sessionChien-Yu Chen2015-04-236-20/+121
* Merge "Smaller selector dot"Alan Viverette2015-04-151-1/+1
|\
| * Smaller selector dotAlan Viverette2015-04-151-1/+1
* | Merge "Make defaultOutgoingPhoneAccount public"Yorke Lee2015-04-152-2/+1
|\ \
| * | Make defaultOutgoingPhoneAccount publicYorke Lee2015-04-152-2/+1
* | | Merge "Add focused state color to rating bar"Alan Viverette2015-04-151-0/+4
|\ \ \
| * | | Add focused state color to rating barAlan Viverette2015-04-151-0/+4
| | |/ | |/|
* | | Merge "Move AssetAtlas off of SkBitmap*"John Reck2015-04-156-125/+103
|\ \ \
| * | | Move AssetAtlas off of SkBitmap*John Reck2015-04-156-125/+103
* | | | Merge "Enable onProvideVirtualAssistStructure API"Selim Gurun2015-04-151-3/+1
|\ \ \ \
| * | | | Enable onProvideVirtualAssistStructure APISelim Gurun2015-04-141-3/+1
* | | | | Merge "Update GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206"destradaa2015-04-152-3/+116
|\ \ \ \ \
| * | | | | Update GpsMeasurements APIs to reflect changes in GPS HAL.destradaa2015-04-152-3/+116
* | | | | | Merge "Audio Devices Enumeration/Notification API"Paul McLean2015-04-158-234/+383
|\ \ \ \ \ \
| * | | | | | Audio Devices Enumeration/Notification APIPaul McLean2015-04-158-234/+383
* | | | | | | Merge "Added TYPE_APPLICATION_ABOVE_SUB_PANEL window type."Wale Ogunwale2015-04-157-16/+34
|\ \ \ \ \ \ \
| * | | | | | | Added TYPE_APPLICATION_ABOVE_SUB_PANEL window type.Wale Ogunwale2015-04-147-16/+34
* | | | | | | | Merge "Check correct NO_ERROR response from Keystore"Andres Morales2015-04-151-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Check correct NO_ERROR response from KeystoreAndres Morales2015-04-151-2/+4
* | | | | | | | | Merge "Moved SystemServer binder thread monitor from AMS to Monitor class."Wale Ogunwale2015-04-152-10/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Moved SystemServer binder thread monitor from AMS to Monitor class.Wale Ogunwale2015-04-152-10/+14
* | | | | | | | | | Merge "Fix bug where preEnroll returned int instead of long"Jim Miller2015-04-151-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bug where preEnroll returned int instead of longJim Miller2015-04-151-3/+4
* | | | | | | | | | | Fix a search bug for wrapped Window.CallbacksAdam Powell2015-04-151-1/+7
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge "Make Telecom/InCallUI APIs public"Jay Shrauner2015-04-1524-148/+606
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make Telecom/InCallUI APIs publicJay Shrauner2015-04-1524-148/+606
* | | | | | | | | | | Merge "camera: Add eviction errorcode to Camera1 API."Ruben Brunk2015-04-153-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | camera: Add eviction errorcode to Camera1 API.Ruben Brunk2015-04-153-2/+8
* | | | | | | | | | | Merge "Zen: Once again called Do not disturb."John Spurlock2015-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Zen: Once again called Do not disturb.John Spurlock2015-04-151-1/+1
* | | | | | | | | | | am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric key...Shawn Willden2015-04-151-5/+10
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from Androi...Shawn Willden2015-04-151-5/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."Shawn Willden2015-04-151-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."Shawn Willden2015-04-151-5/+10
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Unbreak obtaining symmetric keys from AndroidKeyStore.Alex Klyubin2015-04-141-5/+10
* | | | | | | | | | | | | | | Merge "Fix positioned text bounds"Tom Hudson2015-04-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix positioned text boundsTom Hudson2015-04-151-0/+1
* | | | | | | | | | | | | | | | Merge "Remove deprecated telecom APIs. Mark others final."Jay Shrauner2015-04-158-52/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove deprecated telecom APIs. Mark others final.Jay Shrauner2015-04-148-52/+10
* | | | | | | | | | | | | | | | | Merge "Camera2: Add prepare method for output buffer pre-allocation"Eino-Ville Talvala2015-04-1511-20/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Camera2: Add prepare method for output buffer pre-allocationEino-Ville Talvala2015-04-1411-20/+219
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "@hide Binder#blockUntilThreadAvailable API"Wale Ogunwale2015-04-153-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | @hide Binder#blockUntilThreadAvailable APIWale Ogunwale2015-04-153-2/+1
* | | | | | | | | | | | | | | | | Merge "Introduce device owner API to disable the status bar"Benjamin Franz2015-04-157-8/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Introduce device owner API to disable the status barBenjamin Franz2015-04-157-8/+91
* | | | | | | | | | | | | | | | | | Merge "Hide Voicemail APIs"Jay Shrauner2015-04-153-51/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Hide Voicemail APIsJay Shrauner2015-04-143-51/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Fix ApplicationPackageManager.getDrawable() should drawable result"Ricky Wai2015-04-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix ApplicationPackageManager.getDrawable() should drawable resultRicky Wai2015-04-151-1/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Simplify state in View#draw(canvas, parent, drawingTime)"Chris Craik2015-04-151-96/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \