summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am dce7a427: Merge "Full volume on remote submix for apps that need it" into ...Jean-Michel Trivi2014-10-073-6/+154
|\
| * Full volume on remote submix for apps that need itJean-Michel Trivi2014-10-073-6/+154
* | am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-devRoboErik2014-10-031-1/+2
|\ \ | |/
| * Fix regression in RCC.editMetadata(false)RoboErik2014-10-031-1/+2
* | resolved conflicts for merge of 1c92912b to lmp-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
* | | | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-023-3/+1
|\ \ \ \ | |/ / /
| * | | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-013-3/+1
| |/ /
* | | am ee33c661: Merge "Update java doc for content rating systems" into lmp-devSungsoo 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 b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffer...Ruben Brunk2014-09-301-1/+1
|\ \ \ \ | |/ / /
| * | | camera2: Use valid dimensions for RGBA8888 gralloc buffers.Ruben Brunk2014-09-301-1/+1
| |/ /
* | | am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp...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 31f80f0f: Assign bindService() result to a boolean directly. One less if-elseYao Chen2014-09-271-3/+1
|\ \ \ \ | |/ / /
| * | | Assign bindService() result to a boolean directly. One less if-elseYao Chen2014-09-271-3/+1
* | | | am 7e51102c: Merge "Validate MTP path" into lmp-devMarco 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 55ecb483: Merge "Don\'t forward media keys to the app if the phone session...RoboErik2014-09-263-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | Don't forward media keys to the app if the phone session is activeRoboErik2014-09-263-0/+22
| |/ / /
* | | | am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-devRoboErik2014-09-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Disable MediaSessionLegacyHelper debugging" into lmp-devRoboErik2014-09-261-1/+1
| |\ \ \
| | * | | Disable MediaSessionLegacyHelper debuggingRoboErik2014-09-251-1/+1
* | | | | am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-devRoboErik2014-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 86d77815: Merge "Check the return value of bindService, and notify media b...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 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a re...RoboErik2014-09-251-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into...RoboErik2014-09-251-0/+1
| |\ \ \ \
| | * | | | Ensure MediaBrowser state is set to connecting after a reconnectRoboErik2014-09-241-0/+1
* | | | | | am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-252-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-252-2/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow null queues to be set in MediaSessionRoboErik2014-09-242-2/+3
* | | | | | am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-devRonghua Wu2014-09-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "MediaCodecList: fix findEncoderForFormat." into lmp-devRonghua Wu2014-09-251-1/+1
| |\ \ \ \ \
| | * | | | | MediaCodecList: fix findEncoderForFormat.Ronghua Wu2014-09-251-1/+1
| | |/ / / /
* | | | | | am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if que...Lajos Molnar2014-09-251-5/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MediaCodec: revalidate cached queued input buffers if queue fails (2)Lajos Molnar2014-09-241-5/+17
* | | | | | am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if que...Lajos Molnar2014-09-241-4/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "MediaCodec: revalidate cached queued input buffers if queue fails" int...Lajos Molnar2014-09-241-4/+14
| |\ \ \ \ \
| | * | | | | MediaCodec: revalidate cached queued input buffers if queue failsLajos Molnar2014-09-241-4/+14
| | | |/ / / | | |/| | |
* | | | | | am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-242-19/+49
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-242-19/+49
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | camera2: Hide JPEGs in RGBA gralloc buffers.Ruben Brunk2014-09-242-19/+49
| | |/ /