summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-devJean-Michel Trivi2014-10-318-27/+218
|\ | | | | | | | | | | | | automerge: 5a51050 * commit '5a51050519a3738488a4f7186e9822c448362a37': More AudioPolicy registration
| * Merge "More AudioPolicy registration" into lmp-mr1-devJean-Michel Trivi2014-10-318-27/+218
| |\
| | * More AudioPolicy registrationJean-Michel Trivi2014-10-308-27/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define new usage in AudioAttributes to describe "virtual" sources. Maintain a registration string in AudioPolicy and AudioMix that is used for the address of the mix in the native policy manager. AudioPolicy registration marks the audio policy configuration and the audio mixes as registered. The AudioPolicy class is used as the factory for the AudioTrack and AudioRecord objects that are respectively used as the source and sink of the mixes created by the policy owner. Bug 16009464 Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
* | | am c78d450b: TIF: handle inputs holding the overlay view even after the ↵Dongwon Kang2014-10-312-16/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | session release automerge: ce34c6d * commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8': TIF: handle inputs holding the overlay view even after the session release
| * | TIF: handle inputs holding the overlay view even after the session releaseDongwon Kang2014-10-302-16/+74
| | | | | | | | | | | | | | | Bug: 17336221 Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
* | | am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested ↵Dongwon Kang2014-10-311-30/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | before the session initialization" into lmp-mr1-dev * commit '39567dd6480ae2527af8f53199e0f42e1de80b2c': TIF: Handle notifyXXX() calls requested before the session initialization
| * | Merge "TIF: Handle notifyXXX() calls requested before the session ↵Dongwon Kang2014-10-301-30/+59
| |\ \ | | | | | | | | | | | | initialization" into lmp-mr1-dev
| | * | TIF: Handle notifyXXX() calls requested before the session initializationDongwon Kang2014-10-301-30/+59
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we relied on a handler by posting runnables when the session is not initialized yet. However, this trick was broken when we separated the creation procedure into DO_CREATE_SESSION and DO_NOTIFY_SESSION_CREATED. Bug: 17909798 Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
* | | am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT ↵Andre Eisenbach2014-10-301-7/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Headset is connected." into lmp-mr1-dev * commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1': Fix exception in AudioService when no BT Headset is connected.
| * | Fix exception in AudioService when no BT Headset is connected.Andre Eisenbach2014-10-291-7/+11
| |/ | | | | | | | | | | | | | | | | | | | | If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset connected, a NullPointerException will ensue. Added check to make sure mBluetoothHeadsetDevice is set before accessing it. Bug: 17601845 Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
* | Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev ↵Lajos Molnar2014-10-282-6/+10
|\ \ | |/ | | | | | | | | | | | | | | automerge: aab38b7 automerge: e4c7a65 * commit 'e4c7a65140b5523325fd6ca86c196136fe183ee8': MediaCodec/Image: handle null cropRect correctly
| * MediaCodec/Image: handle null cropRect correctlyLajos Molnar2014-10-272-6/+10
| | | | | | | | | | | | | | | | - allow Media.Image.setCropRect(null) to unset cropRect - use full image if cropRect is null in MediaCodec$Image Bug: 18124320 Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
* | Merge "Improve toString() methods for audio classes to help with debugging" ↵Mike Lockwood2014-10-284-5/+114
|\ \ | |/ | | | | | | | | | | | | | | into lmp-mr1-dev automerge: ac7d8c5 automerge: 9f08a9f * commit '9f08a9f08a3440e1f4a0b60c3e0cc5fe3dd71f27': Improve toString() methods for audio classes to help with debugging
| * Merge "Improve toString() methods for audio classes to help with debugging" ↵Mike Lockwood2014-10-274-5/+114
| |\ | | | | | | | | | into lmp-mr1-dev
| | * Improve toString() methods for audio classes to help with debuggingMike Lockwood2014-10-274-5/+114
| | | | | | | | | | | | | | | | | | bug: 18139399 Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
* | | am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-devEric Laurent2014-10-272-24/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: af93061 * commit 'af9306149323120d8098f5fdef15b923e36d9569': audioservice: fix default stream volume
| * | Merge "audioservice: fix default stream volume" into lmp-mr1-devEric Laurent2014-10-272-24/+33
| |\ \
| | * | audioservice: fix default stream volumeEric Laurent2014-10-272-24/+33
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | When the max stream volume is configurable by a system property, the default stream volume should be set accordingly. Bug: 17507571. Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
* | | am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode ↵John Spurlock2014-10-273-6/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | validation check." into lmp-mr1-dev * commit '14882cf3773c7c142c9a8aa4eb7c95a80e5711f9': AudioService: Restore ringer-mode validation check.
| * | Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-devJohn Spurlock2014-10-273-6/+22
| |\ \ | | |/ | |/|
| | * AudioService: Restore ringer-mode validation check.John Spurlock2014-10-243-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | Ensure the ringer-mode is valid when set, and forward client calls to service method to centralize validation. Bug: 17884168 Change-Id: I500f9beefbce5b7a8bc01ca9eb7b4a7a16114160
* | | am 39b15017: am f98fe42f: Merge "TIF: Notify of size change of the video in ↵Jae Seo2014-10-242-133/+259
|\ \ \ | |/ / | | | | | | | | | | | | | | | TvView" into lmp-mr1-dev * commit '39b150173ae3a2b6950553450648d5bb223542e3': TIF: Notify of size change of the video in TvView
| * | TIF: Notify of size change of the video in TvViewJae Seo2014-10-242-133/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the necessary plumbing in place to notify of size change of the video in TvView. Put together the track related logic in TvInputManager.Session. Protected track information with a lock. Also modified debugging messages more consistently and fixed minor warnings in TvView. Bug: 17635300 Change-Id: I8d267d8a11056b5ccee1dacbf2d3391be16f811e
* | | am 0fcddd51: am e41d967c: Merge "TIF: Cache the app private command and send ↵Jae Seo2014-10-241-5/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | it when connection is made" into lmp-mr1-dev * commit '0fcddd513868918215e889db07cdca126f942d89': TIF: Cache the app private command and send it when connection is made
| * | Merge "TIF: Cache the app private command and send it when connection is ↵Jae Seo2014-10-241-5/+24
| |\ \ | | |/ | |/| | | | made" into lmp-mr1-dev
| | * TIF: Cache the app private command and send it when connection is madeJae Seo2014-10-241-5/+24
| | | | | | | | | | | | | | | Bug: 17559793 Change-Id: If785d1ffceb5b5152381818efc4d1c8b5115143c
* | | am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: 8659bf1 * commit '8659bf1929ee2cc4b3c7fd8eaa43825b6d069fb1': [FM]Fix FM App record fail Buganizer ID: 17975676
| * | am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-1/+2
| |\ \ | | | | | | | | | | | | | | | | * commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3': [FM]Fix FM App record fail Buganizer ID: 17975676
| | * | [FM]Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Review: https://partner-android-review.git.corp.google.com/#/c/185235 Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
* | | | Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev ↵Dongwon Kang2014-10-241-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: f6df7bf automerge: d048789 * commit 'd048789aeaf64779a7062faa3bd806c69652857a': TIF: Define more cannonical genres in TvContract
| * | | Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-devDongwon Kang2014-10-241-0/+24
| |\ \ \
| | * | | TIF: Define more cannonical genres in TvContractDongwon Kang2014-10-151-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background: while categorizing broadcast genres into cannonical genres, it turned out that the existing 11 genres are not enough. 6 more genres are added. Bug: 17597747 Change-Id: I14c00771d69f1e30fc2c0e3978298c67066117e5
* | | | | Merge "TIF: fix wrong config comparison & confusing method name" into ↵Wonsik Kim2014-10-241-1/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: cfc7323 automerge: d651007 * commit 'd6510073e7c969c49713f57c0625bb445f8ea210': TIF: fix wrong config comparison & confusing method name
| * | | | Merge "TIF: fix wrong config comparison & confusing method name" into ↵Wonsik Kim2014-10-241-1/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | TIF: fix wrong config comparison & confusing method nameWonsik Kim2014-10-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TvStreamConfig should do deep comparison in TvInputHardwareManager where the object gets created from binder calls. In addition to this fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method name better reflects what it does. Bug: 18027719 Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
* | | | | | Merge "TIF: exclude tuner TV input not having a setup activity in the input ↵Dongwon Kang2014-10-241-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list." into lmp-mr1-dev automerge: f9f7acf automerge: 08fe9fb * commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f': TIF: exclude tuner TV input not having a setup activity in the input list.
| * | | | | TIF: exclude tuner TV input not having a setup activity in the input list.Dongwon Kang2014-10-241-0/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing this, developers can notice the flaw of the input in advance. Bug: 17647146 Change-Id: I123a5538566959320a6201a4d7952e205602a28a
* | | | | am 7d2dcd6b: am 6c9b0847: Merge "Update documentation for ↵Jae Seo2014-10-231-4/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev * commit '7d2dcd6b677f99da90d1cdb65fcfedcb03e54801': Update documentation for notifyTracksChanged() and notifyTrackSelected()
| * | | | Merge "Update documentation for notifyTracksChanged() and ↵Jae Seo2014-10-231-4/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | notifyTrackSelected()" into lmp-mr1-dev
| | * | | | Update documentation for notifyTracksChanged() and notifyTrackSelected()Jae Seo2014-10-231-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18090857 Change-Id: I339a222454612e0111e79725de596a73f4d406b8
* | | | | | am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." ↵Leon Scroggins III2014-10-226-498/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '694fd58dd93b6360ec2204dab731d3c68847478b': Remove outdated tests for custom decoder.
| * | | | | Remove outdated tests for custom decoder.Leon Scroggins III2014-10-226-498/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests don't appear to be meaningful. We are comparing an unused decoder against one that is used. Keeping this test building (the primary changes to this directory in a while) is not believed to be worth the effort. BUG:17419670 Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
* | | | | am a6372b3b: Merge "TIF: add more documentation on Hardware session." into ↵Dongwon Kang2014-10-221-3/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 94e8b9d * commit '94e8b9dc6e001b6d830caa5ff55f4baa809dbba6': TIF: add more documentation on Hardware session.
| * | | | Merge "TIF: add more documentation on Hardware session." into lmp-mr1-devDongwon Kang2014-10-221-3/+13
| |\ \ \ \
| | * | | | TIF: add more documentation on Hardware session.Dongwon Kang2014-10-201-3/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17909341 Change-Id: Ie537eb77b6ac4b63e4e9306c1781f84dd4be2719
* | | | | am c5109b1f: am 01c9d330: am f0a28411: am 2fa604fc: Merge "Add missing break ↵RoboErik2014-10-201-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | to switch statement" into lmp-dev * commit 'c5109b1ffe5fd8d8d95e233edf5e923ae0bbd9f6': Add missing break to switch statement
| * | | | am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into ↵RoboErik2014-10-201-0/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3': Add missing break to switch statement
| | * | | am 2fa604fc: Merge "Add missing break to switch statement" into lmp-devRoboErik2014-10-201-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fa604fc59ded63a416066a0bc66f63069cae7f3': Add missing break to switch statement
| | | * | | Add missing break to switch statementRoboErik2014-10-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the skip to queue item case was falling through when it shouldn't. bug: 18058515 Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
* | | | | | am 7305b465: am d00e68c3: am 26a43094: am 578fbe89: Merge "Set the metadata ↵RoboErik2014-10-201-0/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rating correctly in RCC" into lmp-dev * commit '7305b46527164a6a39681c8f8b721da198a582ae': Set the metadata rating correctly in RCC
generated by cgit v1.1 at 2025-01-26 19:22:55 +0000