summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | MediaCodec: Added E-AC3 mime type (@hide).Rachad2014-12-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I48b2ab64812d860bb1a01d0a14e10690b86c4519
| * | | | | | Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static void CallStaticVoidMethod is variable argument function. if pass 0 to the function like: CallStaticVoidMethod(......, 0), 0 will be treated as INT data type.but in the CallStaticVoidMethod implement 0 will be treated as pointer data type.Pointer in 64bit system occupied 8 bytes, but in 64bit system int occupied 4 bytes. if call function like: CallStaticVoidMethod(......, 0), only low 4 bytes will be assigned 0.Turned out it actually call function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000). intent to pass NULL to function but passed non-NULL parameter to the function.this will cause GCDaemon crash. Bug: 18911458 Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | | am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ↵Narayan Kamath2015-01-062-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | of CallStaticVoidMethod." * commit '3787decd8d41320ec9201405ec4cc893b2c99d78': Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
| * | | | | Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| |\ \ \ \ \
| | * | | | | Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallStaticVoidMethod is varargs function, and calling it with a literal 0 like CallStaticVoidMethod(..., 0) will treat the argument as a 4 byte int in both 32 and 64 bit processes. This is incorrect for pointer arguments where NULL should be used instead. Reviewed-by: Liao, Bruce <bruce.liao@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com> Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
* | | | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'dd65a4f735a311fe60c065449e394974807ff297': Race-condition in SoundPool during release
| * | | | | | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is race between SoundPoolThread and SoundPool / AudioManager threads during releasing SoundPool. AudioManager deletes a global reference before setting SoundPool callback to NULL. If, at that time, a call to the SoundPool::notify fuction happens then mCallback is valid but mUserData is not. The following log will show up to indicate the problem: JNI ERROR (app bug): accessed deleted global reference 0xXXXXXXXX This fix is to clear the SoundPool's callback before releasing global reference. Change-Id: I5e6d647edc0444340db879428048e2c0a068a8b4
* | | | | | | am af84e073: Merge "Audio Policy: Clear calling identity for all paths ↵John Spurlock2014-12-281-32/+27
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting ringer mode." into lmp-mr1-dev automerge: db41690 * commit 'db416907b831010cc2854292aa7de85fd8857a77': Audio Policy: Clear calling identity for all paths setting ringer mode.
| * | | | | | Merge "Audio Policy: Clear calling identity for all paths setting ringer ↵John Spurlock2014-12-241-32/+27
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | mode." into lmp-mr1-dev
| | * | | | | Audio Policy: Clear calling identity for all paths setting ringer mode.John Spurlock2014-12-231-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For proper appops bookkeeping and zen setting changes. Bug: 18832923 Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
* | | | | | | am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into ↵Jean-Michel Trivi2014-12-261-6/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '98ba8409876087f32114d889435b7f1bd7a73ffb': AudioRecord: filter attributes
| * | | | | | Merge "AudioRecord: filter attributes" into lmp-mr1-devJean-Michel Trivi2014-12-221-6/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | AudioRecord: filter attributesJean-Michel Trivi2014-12-221-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating an AudioRecord instance, filter the tags in the AudioAttributes to remove tags that are handled at the Java layer. Bug: 18733215 Bug: 18736417 Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
* | | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into ↵Eric Laurent2014-12-191-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3': AudioService: fix permission check.
| * | | | | | Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
| |\ \ \ \ \ \
| | * | | | | | AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear caller identity before calling TelecomManager.isInCall(). Bug: 18702149. Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
* | | | | | | am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global ↵Oliver Woodman2014-12-191-4/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application context" into lmp-mr1-dev * commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5': MediaSessionLegacyHelper uses global Application context
| * | | | | | Merge "MediaSessionLegacyHelper uses global Application context" into ↵Oliver Woodman2014-12-191-4/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | lmp-mr1-dev
| | * | | | | MediaSessionLegacyHelper uses global Application contextJean-Michel Trivi2014-12-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaSessionLegacyHelper used a Context passed by an application which can cause a leak of Activity instances. Use the global Application context instead. Also prevent crash if a null Context is supplied (method not documented as requesting a non-null Context). Bug 18767503 Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
* | | | | | | am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate ↵John Spurlock2014-12-171-23/+35
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api." into lmp-mr1-dev * commit 'caba360367ea9900a48066f97f4b6e59877a9df6': Audio policy: Fix deprecated shouldVibrate api.
| * | | | | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-171-23/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And apply zen mode immediately to avoid race conditions in tests. Bug: 18702149 Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
* | | | | | am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-163-15/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| * | | | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-163-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18675947 Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
* | | | | | am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ↵Jinsuk Kim2014-12-131-10/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | calling HdmiControlService" into lmp-mr1-dev * commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39': audioservice: Clear calling identity upon calling HdmiControlService
| * | | | | Merge "audioservice: Clear calling identity upon calling HdmiControlService" ↵Jinsuk Kim2014-12-131-10/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | * | | | | audioservice: Clear calling identity upon calling HdmiControlServiceJinsuk Kim2014-12-131-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that accessing the HdmiControlService via audio service should be possible without the system permission. Bug: 18730526 Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
* | | | | | | am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" ↵Chong Zhang2014-12-121-3/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd4bef185a5057904f0e230ac8a2c5866e590094f': parse bitrate range for video/audio caps
| * | | | | | Merge "parse bitrate range for video/audio caps" into lmp-mr1-devChong Zhang2014-12-121-3/+20
| |\ \ \ \ \ \
| | * | | | | | parse bitrate range for video/audio capsChong Zhang2014-12-121-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18684228 Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
* | | | | | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both ↵Chih-hung Hsieh2014-12-115-6/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32-bit and 64-bit builds" * commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e': Adjust format strings to work on both 32-bit and 64-bit builds
| * | | | | | | Merge "Adjust format strings to work on both 32-bit and 64-bit builds"Chih-hung Hsieh2014-12-115-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-055-6/+6
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust format strings to not produce Clang warnings in both 32-bit and 64-bit builds Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| * | | | | | | Merge "media: fix isSupportedFormat for integer frame rate"Lajos Molnar2014-12-081-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | media: fix isSupportedFormat for integer frame rateLajos Molnar2014-12-041-4/+4
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18473065 Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
| * | | | | | | media: allow full range of Vorbis sampling ratesLajos Molnar2014-12-041-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18615604 Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
* | | | | | | resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aospEric Laurent2014-12-102-16/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
| * | | | | | Merge "AudioSystem JNI: Add audio policy custom mixes registration" into ↵Eric Laurent2014-12-102-16/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | | | AudioSystem JNI: Add audio policy custom mixes registrationEric Laurent2014-12-082-16/+14
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16009464. Change-Id: I3763e79f4fa0331acb56d1d6f575c7a36e0bebd5
* | | | | | | am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." ↵Michael Wright2014-12-101-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 422db53 * commit '422db53f8cf2fc69cdf892cb42f33021f510f207': Don't try to scale the bitmaps for null MediaMetadata.
| * | | | | | 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
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18586572 Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
* | | | | | | am 1102e712: Merge "Throw IOException when missing default ringtone." into ↵Jeff Sharkey2014-12-092-6/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 8650c35 * commit '8650c358fb44b943dd74751742333bf1cebf7b8e': Throw IOException when missing default ringtone.
| * | | | | | 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
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is caught by Ringtone, and we then fall back to built-in ringtone, which matches the expected CTS behavior. Bug: 18610451 Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
* | | | | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." ↵Ruben Brunk2014-12-092-26/+54
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 * commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b': Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
| * | | | | | Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." ↵Ruben Brunk2014-12-092-26/+54
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into lmp-mr1-dev
| | * | | | | Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.Ruben Brunk2014-12-092-26/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16030677 Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
* | | | | | | am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once ↵John Spurlock2014-12-081-5/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per volume-down." into lmp-mr1-dev * commit '967e19a402046ba771cdebe99da2488bfc1959b1': Volume: Only play the new vibrate hint once per volume-down.
| * | | | | | Volume: Only play the new vibrate hint once per volume-down.John Spurlock2014-12-081-5/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 18666334 Change-Id: Idfa1d0c104bb310548fde533932bffc2b41eafff
generated by cgit v1.1 at 2025-02-09 13:06:36 +0000