summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 64cb3ec4: am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix r...RoboErik2014-10-031-1/+2
|\
| * am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in ...RoboErik2014-10-031-1/+2
| |\
| | * am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" i...RoboErik2014-10-031-1/+2
| | |\
| | | * Fix regression in RCC.editMetadata(false)RoboErik2014-10-031-1/+2
* | | | am 5d4a1aae: am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string b...Mike Lockwood2014-10-031-2/+3
|\ \ \ \ | |/ / /
| * | | am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string buffer in JNI ...Mike Lockwood2014-10-031-2/+3
| |\ \ \ | | |/ /
| | * | MtpDatabase: Increase size of string buffer in JNI codeMike Lockwood2014-10-031-2/+3
| | |/
* | | am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aospGlenn Kasten2014-10-021-8/+34
|\ \ \ | |/ /
| * | resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aospGlenn Kasten2014-10-021-8/+34
| |\ \
| | * \ Merge "AudioService: Fix monitorRotation for landscape applications"Glenn Kasten2014-10-021-8/+34
| | |\ \
| | | * | AudioService: Fix monitorRotation for landscape applicationsJon Eklund2014-09-231-8/+34
* | | | | am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-023-3/+1
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-023-3/+1
| |\ \ \ \ | | |/ / /
| | * | | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-013-3/+1
| | |/ /
* | | | am 52ecadbf: am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Updat...Sungsoo Lim2014-10-011-1078/+181
|\ \ \ \ | |/ / /
| * | | am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc fo...Sungsoo Lim2014-10-011-1078/+181
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Update java doc for content rating systems" into lmp-devSungsoo Lim2014-10-011-1078/+181
| | |\ \
| | | * | Update java doc for content rating systemsSungsoo Lim2014-10-011-1078/+181
* | | | | am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camer...Ruben Brunk2014-10-011-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid...Ruben Brunk2014-10-011-1/+1
| |\ \ \ \ | | |/ / /
| | * | | camera2: Use valid dimensions for RGBA8888 gralloc buffers.Ruben Brunk2014-09-301-1/+1
| | |/ /
* | | | am 6c583ef7: am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camer...Ruben Brunk2014-09-291-4/+13
|\ \ \ \ | |/ / /
| * | | am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix nativ...Ruben Brunk2014-09-271-4/+13
| |\ \ \ | | |/ /
| | * | Merge "camera2: Fix native ImageReader test segfaults." into lmp-devRuben Brunk2014-09-271-4/+13
| | |\ \
| | | * | camera2: Fix native ImageReader test segfaults.Ruben Brunk2014-09-261-4/+13
* | | | | am ff3796bd: am d4895aa0: am b0def77c: am 3f544e0b: am 31f80f0f: Assign bindS...Yao Chen2014-09-291-3/+1
|\ \ \ \ \ | |/ / / /
| * | | | am d4895aa0: am b0def77c: am 3f544e0b: am 31f80f0f: Assign bindService() resu...Yao Chen2014-09-271-3/+1
| |\ \ \ \ | | |/ / /
| | * | | Assign bindService() result to a boolean directly. One less if-elseYao Chen2014-09-271-3/+1
* | | | | am fa1f0380: am 13d7d40c: am 83c23dda: am c8db4536: am 7e51102c: Merge "Valid...Marco Nelissen2014-09-291-0/+20
|\ \ \ \ \ | |/ / / /
| * | | | am 13d7d40c: am 83c23dda: am c8db4536: am 7e51102c: Merge "Validate MTP path"...Marco Nelissen2014-09-271-0/+20
| |\ \ \ \ | | |/ / /
| | * | | Merge "Validate MTP path" into lmp-devMarco Nelissen2014-09-271-0/+20
| | |\ \ \
| | | * | | Validate MTP pathMarco Nelissen2014-09-261-0/+20
* | | | | | am 66aec18a: am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'...RoboErik2014-09-293-0/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward med...RoboErik2014-09-263-0/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Don't forward media keys to the app if the phone session is activeRoboErik2014-09-263-0/+22
| | |/ / /
* | | | | am 594858c9: am 765ef814: am 5120438b: am 66bc433a: am cab05d54: Merge "Disab...RoboErik2014-09-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 765ef814: am 5120438b: am 66bc433a: am cab05d54: Merge "Disable MediaSessi...RoboErik2014-09-261-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Disable MediaSessionLegacyHelper debugging" into lmp-devRoboErik2014-09-261-1/+1
| | |\ \ \
| | | * | | Disable MediaSessionLegacyHelper debuggingRoboErik2014-09-251-1/+1
* | | | | | am 22069b65: am 3c99bd4b: am 298314cb: am 7d111759: am c80873d5: Merge "Remov...RoboErik2014-09-261-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3c99bd4b: am 298314cb: am 7d111759: am c80873d5: Merge "Remove BT routes w...RoboErik2014-09-261-0/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Remove BT routes when BT is turned off" into lmp-devRoboErik2014-09-261-0/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Remove BT routes when BT is turned offRoboErik2014-09-251-0/+8
* | | | | | am 1fe66b74: am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check...Yao Chen2014-09-261-9/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return v...Yao Chen2014-09-261-9/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Check the return value of bindService, and notify media browser client...Yao Chen2014-09-261-9/+14
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Check the return value of bindService, and notify media browser clientYao Chen2014-09-241-9/+14
* | | | | | am 90b89adb: am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensur...RoboErik2014-09-261-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowse...RoboErik2014-09-261-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into...RoboErik2014-09-251-0/+1
| | |\ \ \ \