summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aospEric Laurent2014-12-102-16/+14
|\
| * Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-...Eric Laurent2014-12-102-16/+14
| |\
| | * AudioSystem JNI: Add audio policy custom mixes registrationEric Laurent2014-12-082-16/+14
* | | am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." ...Michael Wright2014-12-101-1/+3
|\ \ \ | |/ /
| * | Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-devMichael Wright2014-12-091-1/+3
| |\ \
| | * | Don't try to scale the bitmaps for null MediaMetadata.Michael Wright2014-12-091-1/+3
* | | | am 1102e712: Merge "Throw IOException when missing default ringtone." into lm...Jeff Sharkey2014-12-092-6/+11
|\ \ \ \ | |/ / /
| * | | Merge "Throw IOException when missing default ringtone." into lmp-mr1-devJeff Sharkey2014-12-092-6/+11
| |\ \ \
| | * | | Throw IOException when missing default ringtone.Jeff Sharkey2014-12-092-6/+11
| | | |/ | | |/|
* | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." i...Ruben Brunk2014-12-092-26/+54
|\ \ \ \ | |/ / /
| * | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." i...Ruben Brunk2014-12-092-26/+54
| |\ \ \ | | |_|/ | |/| |
| | * | Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.Ruben Brunk2014-12-092-26/+54
* | | | am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once ...John Spurlock2014-12-081-5/+6
|\ \ \ \ | |/ / /
| * | | Volume: Only play the new vibrate hint once per volume-down.John Spurlock2014-12-081-5/+6
| | |/ | |/|
* | | am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" ...Jean-Michel Trivi2014-12-0810-95/+731
|\ \ \ | |/ /
| * | Merge "Support collaborative audio focus handling" into lmp-mr1-devJean-Michel Trivi2014-12-0710-95/+731
| |\ \
| | * | Support collaborative audio focus handlingJean-Michel Trivi2014-12-0510-95/+731
* | | | am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-devJeff Tinker2014-12-081-4/+0
|\ \ \ \ | |/ / /
| * | | Unhide secure stop APIsJeff Tinker2014-12-051-4/+0
* | | | am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionSe...RoboErik2014-12-085-16/+83
|\ \ \ \ | |/ / /
| * | | Merge "Route mute key events through MediaSessionService" into lmp-mr1-devRoboErik2014-12-055-16/+83
| |\ \ \
| | * | | Route mute key events through MediaSessionServiceRoboErik2014-12-055-16/+83
* | | | | am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrows...RoboErik2014-12-081-7/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Make setting the session token in MediaBrowserService synchronous" int...RoboErik2014-12-051-7/+5
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Make setting the session token in MediaBrowserService synchronousRoboErik2014-12-041-7/+5
* | | | am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune op...Dongwon Kang2014-12-081-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "TIF: increase the time threshold for tune operation which was too hars...Dongwon Kang2014-12-051-1/+1
| |\ \ \
| | * | | TIF: increase the time threshold for tune operation which was too harshDongwon Kang2014-12-051-1/+1
* | | | | am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling r...Lajos Molnar2014-12-081-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | media: allow full range of Vorbis sampling ratesLajos Molnar2014-12-041-1/+1
| | |/ / | |/| |
* | | | am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"Chih-hung Hsieh2014-12-041-1/+1
|\ \ \ \
| * \ \ \ Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"Chih-hung Hsieh2014-12-041-1/+1
| |\ \ \ \
| | * | | | Add -Wno-unused-parameter to LOCAL_CFLAGSBernhard Rosenkränzer2014-11-241-1/+1
* | | | | | am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lm...Dongwon Kang2014-12-031-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "TIF: call tune() in HardwareSession" into lmp-mr1-devDongwon Kang2014-12-031-0/+1
| |\ \ \ \ \
| | * | | | | TIF: call tune() in HardwareSessionDongwon Kang2014-11-281-0/+1
* | | | | | | am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection ca...Michael Wright2014-12-031-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-devMichael Wright2014-12-031-5/+7
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Correctly iterate through MediaProjection callbacks.Michael Wright2014-11-211-5/+7
* | | | | | | am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion AP...Jean-Michel Trivi2014-12-027-66/+397
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "AudioMix address and type, rule exclusion API, dynamic source" into lm...Jean-Michel Trivi2014-12-027-66/+397
| |\ \ \ \ \ \
| | * | | | | | AudioMix address and type, rule exclusion API, dynamic sourceJean-Michel Trivi2014-11-307-66/+397
| | | |/ / / / | | |/| | | |
* | | | | | | am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master...Jinsuk Kim2014-12-021-47/+59
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "audioservice: system audio control in master volume mode" into lmp-mr1...Jinsuk Kim2014-12-021-47/+59
| |\ \ \ \ \ \
| | * | | | | | audioservice: system audio control in master volume modeJinsuk Kim2014-12-011-47/+59
| | |/ / / / /
* | | | | | | am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManage...Dongwon Kang2014-12-022-1/+23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp...Dongwon Kang2014-12-022-1/+23
| |\ \ \ \ \ \
| | * | | | | | TIF: fix a race condition when TvInputManager is initializedDongwon Kang2014-12-022-1/+23
* | | | | | | | am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" int...Sungsoo Lim2014-12-021-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Missing Javadoc update while API review" into lmp-mr1-devSungsoo Lim2014-12-021-2/+2
| |\ \ \ \ \ \ \
generated by cgit v1.1 at 2024-06-07 17:30:14 +0000