summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Check that mRemotePlayer is not null before useSimon Wilson2014-04-171-3/+3
| | | | | Bug: 14138829 Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
* Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-29/+26
| | | | | | | | Also addresses style issues noted in post-submit review from https://googleplex-android-review.git.corp.google.com/#/c/439054/ Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5 related-to-bug: 12702350
* Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-6/+147
| | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a related-to-bug: 12702350
* am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in ↵Lajos Molnar2014-03-191-1/+1
|\ | | | | | | | | | | | | MediaTimeProvider" into klp-dev * commit '0dc084865313a416246915c72b29c13cc3f404d4': MediaPlayer: fix int overflow issue in MediaTimeProvider
| * MediaPlayer: fix int overflow issue in MediaTimeProviderLajos Molnar2014-03-191-1/+1
| | | | | | | | | | Bug: 13394783 Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
* | am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
|\ \ | |/ | | | | | | * commit '105c47924f7af9319ec9242b952b4bf074585229': Verify certificates
| * Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-0/+46
| |\
| | * Verify certificatesMarco Nelissen2014-03-132-0/+46
| | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
* | | am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is ↵Zhihai Xu2014-03-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | passed wrong unit parameter from AudioManager" into klp-dev * commit 'bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
| * | DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from ↵Zhihai Xu2014-03-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioManager setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager. It cause maximize volume in Bluetooth speaker/device. The volume expected by Bluetooth Avrcp should be from 0 to 15. But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150. It is scaled by 10 times than the correct volume. index = rescaleIndex(index * 10, streamType, streamTypeAlias); Should divide the volume by 10 before pass to Bluetooth Avrcp. bug:12495379 Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621
* | am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into ↵Marco Nelissen2014-03-071-1/+1
|\ \ | |/ | | | | | | | | | | klp-dev * commit '233e7e9f64be5e85196dd959824bce9a69b2fd99': ExifInterface: fix class load failure
| * ExifInterface: fix class load failureZhijun He2014-03-061-1/+1
| | | | | | | | | | | | | | libexif_jni was renamed as libjhead_jni b/12203995 Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
* | am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" ↵Eric Laurent2014-03-061-1/+1
|\ \ | |/ | | | | | | | | | | into klp-dev * commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3': Fix RemoteController synchronization mode
| * Fix RemoteController synchronization modeJean-Michel Trivi2014-03-061-1/+1
| | | | | | | | | | | | | | | | | | Fix erroneous argument check in RemoteController syncrhonization mode setter.. Bug 12189375 Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10
* | am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media ↵Narayan Kamath2014-01-1614-23/+23
|\ \ | | | | | | | | | | | | | | | | | | classes" * commit 'bc0468e67626937300e9afd182656469463d96a1': AArch64: Use long for pointers in media classes
| * | AArch64: Use long for pointers in media classesAshok Bhat2014-01-1514-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"Narayan Kamath2014-01-073-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '79ceb53ae5b867a954476e3f6499f89664fbc669': AArch64: Use long for pointers in MTP classes
| * | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MTP classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | VideoEditor classes" * commit '08467c5727c04c1fef40ff1e361628944275ef28': AArch64: Use long for pointers in VideoEditor classes
| * | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in VideoEditor classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio ↵Narayan Kamath2014-01-072-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | effect classes" * commit 'c0c92f206eddb6fb319bd11929c1703daf17248f': AArch64: Use long for pointers in audio effect classes
| * | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AudioEffect and Visualizer classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-071-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | AmrInputStream" * commit '80cff94478a39914012df816179ea57c53040903': AArch64: Use long for pointers in AmrInputStream
| * | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AmrInputStream class, as native pointers can be 64-bit. Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | am be8fbb8f: Merge "Remove unused field from MediaMuxer"Narayan Kamath2013-12-181-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1': Remove unused field from MediaMuxer
| * | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-2/+0
| | | | | | | | | | | | Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
* | | am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
|\ \ \ | |/ / | | | | | | | | | * commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57': AArch64: Use long for pointers in MediaDrm and MediaMuxer
| * | Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"Elliott Hughes2013-12-162-11/+11
| |\ \
| | * | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MediaDrm and MediaMuxer classes, as native pointers can be 64-bit. Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | am 37c69fdd: Merge "Use java.util.Objects instead on internal API"Kenny Root2013-12-131-4/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '37c69fdd826f3973966430adc1abfbefc19bc16e': Use java.util.Objects instead on internal API
| * | Use java.util.Objects instead on internal APIKenny Root2013-12-131-4/+3
| |/ | | | | | | | | | | | | Not needed since java.util.Objects implements all the needed functionality. Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
* | Stop wifi display discovery when no longer needed.Jeff Brown2013-11-211-27/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of how many clients are requesting scans and scan continuously until all of them are gone then explicitly terminate the scan instead of letting it time out as before. Suspend wifi display scans while connecting or connected to a remote display. This is handled by both the display manager and media router since neither has complete information about what is happening. Much of this code will no longer be needed once wifi display support is integrated directly into the media router service. Ensure that we don't attempt to scan or connect to wifi displays while the wifi display feature is off. Infer when a connection attempt fails and unselect the wifi display route automatically so it doesn't appear to be connecting forever. Fix issues around correctly canceling and retrying connection attempts. Often we would cancel but not retry. Improved connection reliability somewhat. It seems that discovery must already be in progress in order for a connection attempt to succeed. Ensure QuickSettings uses exactly the same logic as the MediaRouteButton to determine when the remote display tile should be made visible. Bug: 11717053 Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
* | Only scan for wifi display when there is no active connectionsChong Zhang2013-11-191-6/+0
|/ | | | | Bug: 11717053 Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0
* Disallow applications from initiating cast screen.Jeff Brown2013-11-152-8/+82
| | | | | | | | | | | | | | Only allow the system ui and settings to connect to a remote display. To do this, we essentially hide the remote displays from applications by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks around the operations that connect to them. As a bonus, this may actually save power on devices since applications that use MediaRouter will not longer be performing discover on remote display routes at all. Bug: 11257292 Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
* Fix RemoteController update in RemoteControlClient registrationJean-Michel Trivi2013-11-131-3/+2
| | | | | | | | | | | | | | | | | | A regression was introduced when trying to limit the number of internal synchronization generation IDs that caused RCC information to be shown only for applications that requested audio focus after media button receiver and RCC registration, (such as Play Music), not for applications that requested focus first (such as Play Movies). The correct behavior is to always check and update the RemoteControllers (seen by MediaFocusControl as RCD interfaces) whenever a RemoteControlClient is registered (even if it's a re-registration) when it is associated when an entry at the top of the remote control stack. Bug 11657655 Change-Id: I30716e2028f7f718a31e13401b191178735229ff
* UI tweaks.Jeff Brown2013-11-111-45/+68
| | | | | | | | | | | | | | | | | | Hide disabled routes from the chooser. Fix layout of chooser dialog when the settings button is visible and the list is very long to prevent truncation of the settings button. Fix an issue when we fake the route connecting status when a route is selected. The route changed notification needs to be propagated to apps. Fake it better. Immediately disconnect from a route when the connection is lost or a connection attempt fails. Added a few new test displays for this case. Bug: 11257292 Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e
* Changes to support new screen cast settings screen.Jeff Brown2013-11-101-35/+36
| | | | | | | | | | | | | | | | | | | | | | Fixed the Preference ordering code to consider the case where two preferences might have the same order. In that case, it falls back on the title to disambiguate. Previous behavior was undefined (and technically not stable). Expose the wifi display device address. Perform wifi display scans every 10 seconds instead of every 15 to improve reponsiveness. Make sure to define routes for wifi displays that we are connecting to even if they are not yet paired. Simplified the logic for adding and removing these routes to avoid possibly getting out of sync and leaving stale routes behind. Fix wifi display notification icon. Bug: 11257292 Change-Id: I8ac15fb17d83758c0bdce80399e12723c367b83c
* Merge "Update the media router dialogs and integrate into system UI." into ↵Jeff Brown2013-11-111-4/+74
|\ | | | | | | klp-dev
| * Update the media router dialogs and integrate into system UI.Jeff Brown2013-11-101-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | Port the new style UI back into the framework from the support library. There are now two dialogs: a chooser and a controller. We use the same dialogs for selecting routes within app and within quick settings. Note that the new UI does not support any grouping features since they are deprecated and unused. Bug: 11257292 Change-Id: I64e936a18d25ab75f0c470cbc1e7085f67004863
* | Fixed a bug updating presentation displays.Chong Zhang2013-11-081-50/+56
|/ | | | | | | Also made findRemoteDisplay public. Bug: 11257292 Change-Id: Ibc9bf3d8ee7c90293ffd8796270e8883ea458a65
* Merge "Add media router service and integrate with remote displays." into ↵Jeff Brown2013-11-085-93/+709
|\ | | | | | | klp-dev
| * Add media router service and integrate with remote displays.Jeff Brown2013-11-075-93/+709
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new media router service whose purpose is to track global state information associated with media routes. This service publishes routes to the media router instance in application processes and handles requested state changes such as selecting or unselecting global routes. The service also binds to remote display provider services which can offer new remote display routes to the system. Includes a test application for manually verifying certain aspects of the operation of the media router service. The remote display provider interface is essentially a stripped down media route provider interface as defined in the support library media router implementation. For now, it is designed to be used only by first parties to publish remote display routes to the system so it is not exposed as public API in the SDK. In the future, the remote display provider interface will most likely be deprecated and replaced with a more featureful media route provider interface for third party integration, similar to what is in the support library today. Further patch sets integrate these new capabilities into the System UI and Settings for connecting remote displays. Bug: 11257292 Change-Id: I31109f23f17b474d17534d0f5f4503e388b081c2
* | Merge "Add a platform library for remote display providers." into klp-devJeff Brown2013-11-084-0/+264
|\ \ | |/
| * Add a platform library for remote display providers.Jeff Brown2013-11-074-0/+264
| | | | | | | | | | | | | | | | | | This interface allows applications to register services that offer remote displays to the system. The system will then provide UI to allow user to connect to these displays and enable mirroring. Bug: 11257292 Change-Id: I34da5b9dfdaf71267bd3450c505bc1b7368d1b40
* | AudioService: fix notifications with A2DP abs volumeEric Laurent2013-11-041-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | When A2DP absolute volume is enabled, the music stream software volume is maxed out because the headset applies the volume. We must also max out other streams playing over A2DP otherwise they are attenuated twice and are barely audible. Bug: 11316102. Change-Id: I7e58c74cb683ad1d6f3b68abb0ef967c817fbf4f
* | Merge "MediaPlayer: MTP: update state only based on source events" into klp-devLajos Molnar2013-10-281-2/+11
|\ \ | |/ |/|
| * MediaPlayer: MTP: update state only based on source eventsLajos Molnar2013-10-281-2/+11
| | | | | | | | | | | | | | | | | | State only depends on events from the MediaPlayer (this includes the pseudo-event from MTP recovery mechanism.) Change-Id: Idd62a773d2386ad6bfbfe417412c2e2ff09b3600 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11412881
* | Merge "Limit RemoteControlClient generation ID changes" into klp-devJean-Michel Trivi2013-10-251-9/+15
|\ \
| * | Limit RemoteControlClient generation ID changesJean-Michel Trivi2013-10-241-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the beginning of each song, the Music app re-registers its media button event and requests audio focus, which causes the reevaluation of each corresponding stack of clients. Each reevaluation is accompanied by the incrementation of the RemoteControlClient generation ID, which causes RemoteController to issue a notification that the client has changed. The lockscreen correctly interprets this as a reason to dump the current RemoteControlClient data (including the artwork) because it will receive the new data if new one is available. This is what causes the "flashing" of the wallpaper on the lockscreen: for an instant, no client data is available. The fix consists in not causing the client generation ID to be incremented when registrations don't cause any change in the RemoteControlClient stack. Even though Music re-registers everything, nothing has changed: it still is the current media button receiver, and it still has the same RemoteControlClient. Bug 11307382 Change-Id: I4d2404b571e88aeedb0eca6bd19d39f7ec4fc8b1
* | | Missing LoudnessEnhancer constructor and UUID in public APIJean-Michel Trivi2013-10-232-3/+0
|/ / | | | | | | | | | | Bug 11356672 Change-Id: Ia3d16712c8b9bb425a587acd87ba7fad6b4ce31c
generated by cgit v1.1 at 2025-02-14 07:51:37 +0000