summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "DO NOT MERGE: Hide new camera API." into klp-devEino-Ville Talvala2013-10-132-13/+2
|\
| * DO NOT MERGE: Hide new camera API.Eino-Ville Talvala2013-10-112-13/+2
| | | | | | | | | | | | | | | | Not yet ready. Bug: 11141002 Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
* | Remote volume changesJean-Michel Trivi2013-10-113-23/+76
|/ | | | | | | | | | | | | | | When the user plays media remotely, and presses on the volume keys with the screen off, verify whether not only local playback is active, but also if remote playback is active to see if the volume should be adjusted. When adjusting the volume with screen off, adjust the remote volume if applicable. When controlling volume, give priority to local media playback. Bug 11169862 Change-Id: I88a8c003969177d50d4c1569ec6cd2a7c153a341
* Make RemoteController weakly referenced by IRemoteControlDisplayJean-Michel Trivi2013-10-081-17/+52
| | | | | | | | | | | | | | | In the RemoteController implementation, the inner class that implements the IRemoteControlDisplay interface must have a weak link to the RemoteController instance with which it is associated, as MediaFocusControl and RemoteControlClient hold a strong reference to this binder object in a different remote process. Without a weak reference, any object referencing RemoteController couldn't be independently garbage collected without a garbage collection in the remote process. Bug 8209392 Change-Id: I29e4274c45249b3cb0d3d89417c69e8fe8f62fc4
* Merge "Update RemoteController info when enabling/disabling it" into klp-devJean-Michel Trivi2013-10-082-0/+33
|\
| * Update RemoteController info when enabling/disabling itJean-Michel Trivi2013-10-072-0/+33
| | | | | | | | | | | | | | | | | | | | | | When a RemoteController listener is disabled: send its listener "blank" information (no artist, "stopped state"...) When a RemoteController listener is enabled: have the current RemoteControlClient send the current information. Bug 8209392 Change-Id: I375bf3c42a425ada94c61453b51669d7e819dde4
* | Merge "Camera2: add metadata override" into klp-devRachad Alao2013-10-071-26/+142
|\ \ | |/ |/|
| * Camera2: add metadata overrideZhijun He2013-10-071-26/+142
| | | | | | | | | | | | | | | | | | | | | | | | There are interface difference between managed and native side for some metadata, like Face and JPEG format. we need override them when they are set/get between native and managed sides. Also fix some issues in the CameraMetadataTest. Bug: 10406212 Change-Id: Ibd8be0415968445e711b3ea89f45e1edfa193ee2
* | Merge "Also rely on enabled notification listeners for RemoteController ↵Jean-Michel Trivi2013-10-078-153/+427
|\ \ | |/ |/| | | registration" into klp-dev
| * Also rely on enabled notification listeners for RemoteController registrationJean-Michel Trivi2013-10-048-153/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Registration of a RemoteController may succeed only if: - the caller has the MEDIA_CONTENT_CONTROL permission, - or if the RemoteController.OnClientUpdateListener it registers if one of the enabled notification listeners. For using the "enabled notification listener" functionality, the CL involved: - making OnClientUpdateListener an interface so a 3rd-party application may have its implementation extend NotificationListenerService, which is required for a listener to be enabled by the user. - add the concept of "enabled" status in an IRemoteControlDisplay, so a RemoteController (which encapsulates the IRemoteControlDisplay implementation) may be registered, but later temporarily disabled by the user, as a result of a user action in the security settings, or a user switch. - making MediaFocusControl, the component tied to AudioService, monitor changes in enabled notification listeners, and act upon enable/disable changes. Bug 8209392 Change-Id: Ia8dfa2156c65668b2b0d4ae92048005912652d84
* | Merge "audioservice: fix DTMF stream volume" into klp-devEric Laurent2013-10-041-56/+71
|\ \ | |/ |/|
| * audioservice: fix DTMF stream volumeEric Laurent2013-10-031-56/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | DTMF stream must also be muted by silent mode when following ring stream volume in order to be properly muted and unmuted when ringer mode changes. Also fix a problem in VolumeStreamState.setAllIndexes() when some devices are not present in the stream state from which indexes are copied. Bug: 10932676. Change-Id: I373d0fd1a475980786d97d97348d46a7e7421461
* | Fix docsAdam Powell2013-10-031-1/+1
| | | | | | | | Change-Id: I19e0cdab6c526f7eed376fc2067b5c49b31a3ea9
* | Merge "Add a scrubber to keyguard; layout tweaks" into klp-devAdam Powell2013-10-032-5/+67
|\ \
| * | Add a scrubber to keyguard; layout tweaksAdam Powell2013-10-032-5/+67
| |/ | | | | | | | | | | | | | | | | | | Switch KeyguardTransportControlView over to using RemoteController instead of the internal API. Guard transition animations behind a flag until we can work out some intermittent issues. Change-Id: Ie9f41339ce6e735c5d524db88437672f2c9859e2
* | Camera2: Implement idle callbacksEino-Ville Talvala2013-10-032-6/+99
|/ | | | | | | | | - Rework camera callback binder interface - Connect up idle, disconnect callbacks - A few unit tests for shutter firing and idle use Bug: 10549462 Change-Id: I8455a8a0561e366b7edeef6b101682be2ec44d79
* Merge "audioservice: always acquire wake lock as AudioService" into klp-devEric Laurent2013-10-011-0/+4
|\
| * audioservice: always acquire wake lock as AudioServiceEric Laurent2013-10-011-0/+4
| | | | | | | | | | | | | | | | | | | | When a wake lock is aquired while executing a binder call and released in the message handler, AppOps complains about the uid mismatch. Clear the binder identity before acquiring the wake lock. Bug: 10627124. Change-Id: Ibd5babc1ae699bffde1a659562089eb091879106
* | Merge "Fix MediaTimeProvider seek & time drift recovery issue" into klp-devLajos Molnar2013-10-011-3/+24
|\ \
| * | Fix MediaTimeProvider seek & time drift recovery issueLajos Molnar2013-09-301-3/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle MEDIA_SKIPPED event Prevent notifyTimedEvent events (REFRESH_AND_/NOTIFY_TIME) to eclipse NOTIFY_SEEK events. Add automatic seek when time drifts too much. This should not happen under normal circumstances, but is there to recover from any unannounced media time discontinuity. Change-Id: I8d7fdac2b0b6a9e62d2860461e6a25788e77fef8 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10954008
* | Merge "Cache RemoteController artwork bitmap size, use it in registration" ↵Jean-Michel Trivi2013-09-302-20/+35
|\ \ | | | | | | | | | into klp-dev
| * | Cache RemoteController artwork bitmap size, use it in registrationJean-Michel Trivi2013-09-292-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow an app to set the artwork configuration at any point regardless of the registration state, and cache the width/height values. If the RemoteController is already registered, apply them. If the RemoteController is not registered, use the cached value when the object gets registered. Bug 10862527 Change-Id: If633e2b9383e7d59690288d2271113e98b195cd8
* | | Merge "Improve RemoteControlDisplay registration" into klp-devJean-Michel Trivi2013-09-303-22/+155
|\ \ \ | |_|/ |/| |
| * | Improve RemoteControlDisplay registrationJean-Michel Trivi2013-09-293-22/+155
| |/ | | | | | | | | | | | | | | | | | | When a new RemoteControlDisplay gets registered, don't cause all existing RemoteControlDisplays to re-receive RemoteControl information they already have. Bug 8417073 Change-Id: Icc8e7104d6870f748fddd702692789dbaef948ac
* | am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in ↵David Friedman2013-09-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs * commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb': Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
| * \ am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool ↵David Friedman2013-09-271-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs * commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f': Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
| | * \ am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed ↵David Friedman2013-09-271-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo in security file. Bug: 10807931 10796994" into jb-mr2-docs * commit '8c38ea39203016dde95bc5dd68f27f6f45096784': Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
| | | * | Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.David Friedman2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10807931 10796994 Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
* | | | | Merge "Make SubtitleController thread safe" into klp-devLajos Molnar2013-09-272-10/+88
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make SubtitleController thread safeLajos Molnar2013-09-272-10/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the concept of an anchor looper. Allow show/hide/selectTrack/selectDefaultTrack to be called from thread other than anchor looper. Change-Id: Iaf2f3d3c46d1b00a0a24156745ec16b301c80c04 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10919206
* | | | | Merge "Fix logic in fallback ringtone handling" into klp-devMarco Nelissen2013-09-261-1/+3
|\ \ \ \ \
| * | | | | Fix logic in fallback ringtone handlingMarco Nelissen2013-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code would only play a fallback ringtone if the requested ringtone was one of the three ringtone uris that are defined by settings, and it wasn't set to "silent". Now it also plays the fallback for custom ringtone uris. b/10891718 Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
* | | | | | Merge "Camera2: Fix Camera integration test deadlock" into klp-devZhijun He2013-09-261-7/+33
|\ \ \ \ \ \
| * | | | | | Camera2: Fix Camera integration test deadlockZhijun He2013-09-251-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was: when SurfaceTexture is used, test didn't acquire/release images when they are produced, then it starves the producer and cause deadlock. This change replaces SurfaceTexture with ImageReader, release every image produced immediately. Bug: 10360518 Change-Id: I9aabaee23013277c2da6f5825ac931bc10511fbc
* | | | | | | Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-devZhijun He2013-09-251-0/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2: Implement CameraManager#getCameraCharacteristicsZhijun He2013-09-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10904541 Bug: 10360518 Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
* | | | | | | Merge "Fix caption rendering" into klp-devAlan Viverette2013-09-251-0/+17
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix caption renderingAlan Viverette2013-09-251-0/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed rendering of captions in regions and incorrect caption width measurement. Removes minimum-difference line wrapping, since the results weren't consistent with StaticLayout's rendering. BUG: 10917766, 10822229 Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
* | | | | | Fix hangMarco Nelissen2013-09-251-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | b/10855561 Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
* | | | | Merge "Fix artwork not received in RemoteController metadata update." into ↵Jean-Michel Trivi2013-09-241-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | Fix artwork not received in RemoteController metadata update.Jean-Michel Trivi2013-09-231-3/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regardless of the artwork value, always update the metadata. When updating the metadata, make sure the artwork is stored in the artwork field, not in the bundle of the MetadataEditor. Bug 10862527 Change-Id: Iec83fd9bb358a91c852099b30bb6d307a52a034c
* | | | | Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-devLajos Molnar2013-09-241-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WebVttRenderer: allow BOM at beginning of a WebVTT file.Lajos Molnar2013-09-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of the spec. Change-Id: I61ccc259c0b9d3a2bc4273925665d107b0c89c62 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10900755
* | | | | Public API for peak and RMS monitoring through the Visualizer effectJean-Michel Trivi2013-09-231-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public API to extend the capabilities of the Visualizer audio effect with measurements of peak and RMS values. Bug 8413913 Change-Id: Ifc6646e013ec55fde3523fab685add1d043f1272
* | | | | Merge "Add audio level monitoring capabilities in Visualizer effect" into ↵Jean-Michel Trivi2013-09-232-0/+182
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | Add audio level monitoring capabilities in Visualizer effectJean-Michel Trivi2013-09-232-0/+182
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the visualizer audio effect with the capability to query peak and RMS values for the currently playing audio. Values are expressed in mB and are retrieved as an array of int values in the native layer, and written directly as object fields for the JNI. Bug 8413913 Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
* | | | | camera2: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-211-2/+2
|/ / / / | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
* | | | Merge "Public API for RemoteController" into klp-devJean-Michel Trivi2013-09-193-174/+173
|\ \ \ \
| * | | | Public API for RemoteControllerJean-Michel Trivi2013-09-183-174/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Public API, under system|signature permission for access to currently playing metadata and playback state. Public API for sending media key events. Bug 8209392 Change-Id: I39b9309ca3fb1bc305492bad98740df0ae0842b2
* | | | | Merge "ImageReader: disable NV21 support" into klp-devZhijun He2013-09-182-4/+15
|\ \ \ \ \
generated by cgit v1.1 at 2025-02-15 22:03:23 +0000