summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Volume: Improve inline volume controls used in settings." into ↵John Spurlock2014-12-013-18/+23
|\ | | | | | | lmp-mr1-dev
| * Volume: Improve inline volume controls used in settings.John Spurlock2014-11-283-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make the system internal ringer mode change signal available to other system components via a standard intent, instead of a volume-controller-only binder call. - Update sysui to use new intent for icon policy. - Add proper muting state to the volumizer, to look more like the associated volume panel slider. - Add basic ringer mode state tracking for the notification-ring slider setting. Bug: 17899613 Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
* | Set stream volume to max when userMasterVolume is set to true.Wally Yau2014-11-281-8/+8
| | | | | | | | | | | | | | | | | | | | When useMasterVolume is set, we don't want to apply the volume attenuation twice, once at the stream mixer and once at the master volume control. It should only be applied once at the master volume control. Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0 Fixed: b/18460548
* | Merge "Do not perform forceVolumeControlStream in master volume mode" into ↵Jinsuk Kim2014-11-261-0/+3
|\ \ | | | | | | | | | lmp-mr1-dev
| * | Do not perform forceVolumeControlStream in master volume modeJinsuk Kim2014-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The method should be no-op when in master volume mode. Bug: 18250921 Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
* | | Fix broken @see javadoc in android.media.* classesRyan Lothian2014-11-264-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This CL fixes all android.media.* javadoc that includes an "ERROR(...)" message when rendered to HTML. Bug: 18537403 Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905 (cherry picked from commit d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
* | | Merge "Allow set loop and position before write for static AudioTracks" into ↵Andy Hung2014-11-261-2/+2
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | Allow set loop and position before write for static AudioTracksAndy Hung2014-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setPlaybackHeadPosition and setLoopPoints in STATE_NO_STATIC_DATA for consistency with other setters and older Android versions (JB). Bug: 18217633 Change-Id: Id8ada3056540c4dfcb89f8afa887159e48db0263
* | | | Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." ↵Eric Laurent2014-11-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.Eric Laurent2014-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18271714. Change-Id: I2fa6f44ef991aec5a980d70f698813468e7540c6
* | | | | Merge "media: add support for 160-byte image info in MediaCodec" into ↵Lajos Molnar2014-11-251-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | lmp-mr1-dev
| * | | | media: add support for 160-byte image info in MediaCodecLajos Molnar2014-11-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some 64-bit compilers now create 160-byte image structures. Bug: 18513091 Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
* | | | | VolumeZen: Introduce internal vs external ringer mode.John Spurlock2014-11-255-72/+223
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stabilize mapping between ringer-mode=silent and zen=priority by keeping track of two ringer modes: - Internal ringer mode: Used for underlying stream muting - External ringer mode: Reported to clients The mapping between external ringer mode + zen is: - normal = all - vibrate = all - silent = priority (read-write) or none (read) Changes include: - Remove "zen check" from audio service, back to audio service having no knowledge of zen. - Maintain a new external ringer mode in audio service, this is the ringer mode reported through AudioManager to callers, also mapped to the change intent. - Introduce a "ringer mode delegate" to the local audio manager interface, responsible for observing external / internal mode changes, and making changes if necessary. - Internal ringer mode changes are still interesting to the volume dialog, wire up a callback through the existing IVolumeController interface. - On devices without vibration, the mapping is the same but since no ringer mode change is possible, disable the icon toggle and remove the mute icon when volume=0. - On devices with vibration, volume down presses should pulse the vibrate icon (and vibrate) as a hint that this is as low as the device can go using the keys. Since the mechanics are similar to the existing zen=none hint, pull into shared helper. - Log ringer mode changes to the zen log, include calling package information for issue diagnosis. - Include whether vibration is supported in the audio service dump. - Update the status bar icon policy to use the internal ringer mode, not the external mode (for vibrate icon). - Update the "Muted by <x>" logic, include current suppressor in dumpsys, ensure suppression icon is enabled & !clickable, regardless of zen mode. Bug: 17884168 Bug: 15471679 Bug: 16824970 Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
* | | | Merge "Delay calling onConnected until a session is set in MediaBrowser" ↵RoboErik2014-11-241-7/+27
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | Delay calling onConnected until a session is set in MediaBrowserRoboErik2014-11-241-7/+27
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will delay all calls to onConnected from the MediaBrowserService until a session token has been set. This also requires making it an exception to try setting the session twice. bug:18052336 Change-Id: Iecf186c53364183e1696af83a855c8db3294a5d0
* | | | Add support for audio focus lockingJean-Michel Trivi2014-11-245-44/+166
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | New API for a registered AudioPolicy to lock/unlock the audio focus stack and prevent any new grant of focus, similar to the way phone calls behave. Bug 16010554 Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
* | | media: fix isSupportedFormat for integer frame rateLajos Molnar2014-11-201-4/+4
|/ / | | | | | | | | Bug: 18473065 Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
* | Merge "Convert record channel mask for dynamic mix" into lmp-mr1-devJean-Michel Trivi2014-11-202-1/+31
|\ \
| * | Convert record channel mask for dynamic mixJean-Michel Trivi2014-11-202-1/+31
| |/ | | | | | | | | | | | | | | | | | | | | When creating the AudioRecord instance for a dynamic mix, convert the output channel mask of the mix to an input channel mask to be used by the AudioRecord instance through which the mixed audio is rerouted. Bug 16009464 Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
* | Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in ↵Jae Seo2014-11-201-0/+39
|\ \ | | | | | | | | | TvView." into lmp-mr1-dev
| * | TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.Dongwon Kang2014-11-191-0/+39
| |/ | | | | | | | | | | | | | | | | | | | | Background: because the hole-punching code lives only in SurfaceView, the overlay view can be covered by the application if the TV input changes the position of SurfaceView via Session.layoutSurface(). This change punches a hole as large as TvView so that the underlying overlayview can be shown properly. Bug: 18420642 Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
* | Merge "TIF: enhance documentation for ↵Jae Seo2014-11-201-0/+6
|\ \ | | | | | | | | | TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev
| * | TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()Wonsik Kim2014-11-121-0/+6
| | | | | | | | | | | | | | | Bug: 18283466 Change-Id: Ibb5d45c02a327e0b3e837ad3ec3603fa1623ff7b
* | | Merge "Handle volume events on master volume devices correctly" into lmp-mr1-devRoboErik2014-11-202-9/+24
|\ \ \
| * | | Handle volume events on master volume devices correctlyRoboErik2014-11-182-9/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | We weren't passing volume events to the master volume correctly on devices that only use a master volume. This fix checks if the device only has a master volume and adjusts the master volume instead of the stream's volume if that's the case. bug:18305790 Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
* | | Scale bitmaps in metadata sent to the systemRoboErik2014-11-192-5/+42
| |/ |/| | | | | | | | | | | | | | | This scales down any MediaMetadata bitmaps that are sent to the system through MediaSession. bug:18114918 bug:18084448 Change-Id: Ib7b040cd8245108ad2dd56afe2499290d2b49f51
* | Merge "TIF: make the tune request handling more efficient" into lmp-mr1-devJae Seo2014-11-181-0/+8
|\ \
| * | TIF: make the tune request handling more efficientDongwon Kang2014-11-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clear the pending tune operations to handle consecutive tune requests efficiently. - Add time out for onTune() to make developers not to handle whole tune process in the onTune() method. Bug: 18179595 Change-Id: I571e55b78d7c4d17c7237c5ce70203941bec2130
* | | Volume: Don't allow ringer volume of 0 exiting ringer mode.John Spurlock2014-11-181-2/+2
|/ / | | | | | | | | | | | | For any device with vibration, not only voice-capable devices. Bug: 18423530 Change-Id: I0f1a7df884d675e6bc6854dcf044426c07f3d2f7
* | Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-devJeff Sharkey2014-11-131-3/+9
|\ \
| * | Move ringtone redirection to MediaPlayer.Jeff Sharkey2014-11-131-3/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI which redirects through SettingsProvider before finally ariving at the real underlying ContentProvider, usually MediaStore. With new SELinux rules, we're no longer allowing the system_server to hold open FDs to shared storage devices, which causes these proxied openFile() calls to fail. To work around this, teach MediaPlayer to resolve the final ringtone Uri without going through the system. Bug: 18226181 Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
* | Merge "Support for delayed audio focus" into lmp-mr1-devJean-Michel Trivi2014-11-135-36/+187
|\ \ | |/ |/|
| * Support for delayed audio focusJean-Michel Trivi2014-11-115-36/+187
| | | | | | | | | | | | | | | | | | | | | | | | New internal API for an audio focus requester to always enter the audio focus stack even if audio focus can't be granted immediately (e.g. during a phone call). Remap the "no delay" interface to the new "requestAudioFocus" method signature and AIDL. Bug 16010554 Change-Id: Iff91ddb0beb411cca1f8cf98300a9afc4178dc7f
* | Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into ↵Chong Zhang2014-11-111-1/+5
|\ \ | | | | | | | | | lmp-mr1-dev
| * | return error MEDIA_ERROR_UNSUPPORTED when Range request failChong Zhang2014-11-101-1/+5
| | | | | | | | | | | | | | | Bug: 18235751 Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
* | | am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-devJason Parks2014-11-071-0/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit '94c3e3bfcfe8d91283560082c737cb62e8d06742': Fix NPE for CTS.
| * | | Fix NPE for CTS.Jason Parks2014-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The effect list can be empty and will return null from native code. This fixes the CTS crash. Bug: 18256010 Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
* | | | Merge changes If4c38bfe,Id9878186 into lmp-mr1-devRoboErik2014-11-062-0/+35
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * changes: Update metadata artwork and uri docs skip MediaController callbacks if it's been unregistered
| * | | Update metadata artwork and uri docsRoboErik2014-11-061-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the Javadoc on the bitmap and uri fields to strongly suggest Uris be used for high res artwork and strongly suggest Uris use the content: style and support EXTRA_SIZE. Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
| * | | skip MediaController callbacks if it's been unregisteredRoboErik2014-11-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives slightly better gaurantees around when an app will receive a callback. As long as they remove a callback on the same thread calls get posted on they won't receive any callbacks after the remove. bug:18104724 Change-Id: Id9878186f005bf0b35c0380cd35f8fd7e67d1d90
* | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-061-0/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing secure stop methodsJeff Tinker2014-11-031-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18053197 b/18076411 Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
* | | | am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent ↵Andrew Solovay2014-11-051-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | method." into lmp-docs automerge: 8d7d7b4 * commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead': docs: Removed broken link to non-existent method.
| * | | am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent ↵Andrew Solovay2014-11-051-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method." into lmp-docs * commit '56576838a8e8c4f44f8df13cc40295a918540b86': docs: Removed broken link to non-existent method.
| | * | | docs: Removed broken link to non-existent method.Andrew Solovay2014-11-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc had included link to method MediaBrowserService.onLoadIcon(). Per bug http://b/17205016 that method was removed before release. Revised doc is staged to: http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html (Note that the other "See Also" link, which I didn't remove, is badly formatted because Javadoc seems to choke on links to methods that are passed generic types. JoeFernandez@, if you can suggest a better way to format that link I'll make that change too.) bug: 18229650 Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
* | | | | Merge "Post volume requests to the handler thread in MediaSession" into ↵RoboErik2014-11-051-10/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | Post volume requests to the handler thread in MediaSessionRoboErik2014-10-281-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume requests should be getting sent on the same thread as other callbacks, not on the binder thread. bug:18156755 Change-Id: I35bceb3f8c74ccba35f3d08ff000a254fcbd04bb
* | | | | | Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-devRoboErik2014-11-052-4/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add extras to the PlaybackState Add setRatingType to MediaSession
| * | | | | | Add extras to the PlaybackStateRoboErik2014-11-041-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to include extras that are atomic with play state changes. bug:18189125 bug:18103891 Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
| * | | | | | Add setRatingType to MediaSessionRoboErik2014-11-042-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing in L. Needed to tell controllers how to rate content. bug:18051829 Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
generated by cgit v1.1 at 2025-02-10 03:51:15 +0000