summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "media: Implement getAchievableFrameRatesFor with measured frame ↵Ronghua Wu2015-07-141-2/+62
|\ | | | | | | rate." into mnc-dev
| * media: Implement getAchievableFrameRatesFor with measured frame rate.Ronghua Wu2015-07-071-2/+62
| | | | | | | | | | Bug: 20507129 Change-Id: I4751ea0f8d4f1173ace18d397b59e9cd6c70688f
* | Merge "Mute correct user from device policy manager." into mnc-devKenny Guy2015-07-092-5/+8
|\ \
| * | Mute correct user from device policy manager.Kenny Guy2015-07-082-5/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per user versions of mute methods so device policy manager can mute the correct user. Just persist change if the calling user isn't the current user. Treat calls to audio manager coming from uid 1000 as if they were coming from current user rather than user 0 so that the correct user's user restriction is checked. Bug: 21782066 Bug: 21778905 Change-Id: I51469b741096d8a2ffdc520eaf5b3fd754f2c819
* | Merge "Generate stable MTP storage IDs." into mnc-devJeff Sharkey2015-07-081-12/+0
|\ \
| * | Generate stable MTP storage IDs.Jeff Sharkey2015-07-071-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | It ends up that MediaProvider is persisting MTP storage IDs in its database, so we need to make sure we generate stable IDs over time, otherwise we can end up looking into a black hole. Bug: 22256092 Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
* | | Merge "audio: add definitions for devices connected over IP" into mnc-devEric Laurent2015-07-082-0/+17
|\ \ \
| * | | audio: add definitions for devices connected over IPEric Laurent2015-07-062-0/+17
| | |/ | |/| | | | | | | | | | | | | Bug: 22068684. Change-Id: I0411679d2852135d4af3016844ced74f7718fa0d
* | | Merge "ImageWriter: Exception when Surface is abandoned" into mnc-devChien-Yu Chen2015-07-072-11/+57
|\ \ \
| * | | ImageWriter: Exception when Surface is abandonedChien-Yu Chen2015-07-062-11/+57
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw IllegalStateException when queueing or dequeueing an image if the input surface is already abandoned by the consumer. Also fix a crash when planes are not initialized when closing ImageWriter. Bug: 22279111 Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
* | | Merge "MediaSessionManager: make the binder implementation static" into mnc-devDongwon Kang2015-07-071-11/+25
|\ \ \ | |_|/ |/| |
| * | MediaSessionManager: make the binder implementation staticDongwon Kang2015-07-071-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | Removing references to application resources on unregistering so that they can be GCed as ealry as possible. Bug: https://code.google.com/p/android/issues/detail?id=161398 Change-Id: Icc083f4a58bb5e738aa662247dc83d021a9dc5c3
* | | Merge "Report specific exception type on decrypt with invalid session" into ↵Jeff Tinker2015-07-072-0/+18
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | Report specific exception type on decrypt with invalid sessionJeff Tinker2015-07-062-0/+18
| | | | | | | | | | | | | | | | | | | | bug: 22235465 Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
* | | | Merge "ImageUtils: fix image copy issue" into mnc-devZhijun He2015-07-071-2/+82
|\ \ \ \ | |_|/ / |/| | |
| * | | ImageUtils: fix image copy issueZhijun He2015-07-061-2/+82
| | |/ | |/| | | | | | | | | | | | | | | | | | | Source and destination images may have different alignment requirements, therefore may have different strides. Copy row by row for such case. Bug: 21934891 Change-Id: Id53f45f1429d233032fa608f7ab9e2774e88c13b
* | | Merge "Ringtone: add support for volume control and looping" into mnc-devJean-Michel Trivi2015-07-062-2/+65
|\ \ \ | |/ / |/| |
| * | Ringtone: add support for volume control and loopingJean-Michel Trivi2015-07-062-2/+65
| | | | | | | | | | | | | | | | | | Bug 22182606 Change-Id: Ied910b9fe02a5da9c4822a107ee884677c8b4991
* | | Merge "media: clean up the usage of max-supported-instances." into mnc-devRonghua Wu2015-07-011-5/+2
|\ \ \ | |/ / |/| |
| * | media: clean up the usage of max-supported-instances.Ronghua Wu2015-06-291-5/+2
| | | | | | | | | | | | | | | Bug: 22089269 Change-Id: I05ab49c8b5aaaa0adb6c1a5a1f7af33e6abc5b91
* | | Volume change intent carries stream aliasJean-Michel Trivi2015-06-291-0/+11
|/ / | | | | | | | | | | | | | | | | | | Define a new extra, AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, to be sent along with the volume change intent, VOLUME_CHANGED_ACTION. When sending VOLUME_CHANGED_ACTION, attach the stream type alias. Bug 17955277 Change-Id: I04fd279e223504e3ee1581086d7e9205344a6808
* | Merge "AudioManager: optimize audio port listener registration" into mnc-devEric Laurent2015-06-261-4/+11
|\ \
| * | AudioManager: optimize audio port listener registrationEric Laurent2015-06-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to reduce the number of binder calls, only install an audio port callback in a client process if either: - an audio port related API has been called once - an audio port listenr has been registered. Bug: 22045560. Change-Id: I0e5cf31bec0c986d6f7761891b860ba6fadd2f4c
* | | Merge "media: parse max-concurrent-instances." into mnc-devRonghua Wu2015-06-251-0/+3
|\ \ \ | |/ / |/| |
| * | media: parse max-concurrent-instances.Ronghua Wu2015-06-251-0/+3
| | | | | | | | | | | | | | | Bug: 22089269 Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18
* | | Merge "TIF: Always invalidate the session callback when resetting TvView" ↵Jae Seo2015-06-231-12/+16
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | TIF: Always invalidate the session callback when resetting TvViewJae Seo2015-06-231-12/+16
| |/ / | | | | | | | | | | | | Bug: 20060638 Change-Id: If743eaa025e9bb5bc580d50697f9f20ff9d0fe0a
* | | TIF: Add more description to the poster art and thumbnail columnsJae Seo2015-06-231-3/+26
| |/ |/| | | | | | | Bug: 21971851 Change-Id: Ibffc42060281d1a9fe1bd83b24f33c6ac19d0afa
* | CamcorderProfile: clarify the high speed profile semanticsZhijun He2015-06-231-1/+65
|/ | | | | Bug: 21442271 Change-Id: I61da855d8f260c5b7ff8a3efd6fab6d6dedd4e2b
* Merge "TIF: Minor code improvement" into mnc-devJae Seo2015-06-225-22/+19
|\
| * TIF: Minor code improvementJae Seo2015-06-215-22/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unnecessary 'final' keywords for private methods - Removed unnecessary interface modifiers - Added a missing ‘final’ keyword - Simplified if statements - Removed Javadoc links pointing to itself - Removed redundant conditional expressions - Removed unnecessary return statements - Replaced explicit types with <> - Removed an unnecessary unboxing - Removed a redundant initializer - Fixed typos Change-Id: I1d137fda70192b33dd00e92ab01396519135ab39
* | TIF: Use equals() instead of '==' for String comparisonsJae Seo2015-06-211-3/+6
|/ | | | Change-Id: Iea6e3d5f5146e2e3a37c52db5a0a9706540ddb23
* Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into ↵Jae Seo2015-06-211-0/+104
|\ | | | | | | mnc-dev
| * TIF: Add the columns for the app-linking to TvContract.ChannelsJae Seo2015-06-191-0/+104
| | | | | | | | | | | | | | | | | | | | The app-linking allows channel input sources to provide activity links from their live channel programming to another activity. This enables content providers to increase user engagement by offering the viewer other content or actions. Bug: 21884742 Change-Id: Iabeea57884c63ac31ee164c27c6e2fe1860f15f6
* | Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-devJae Seo2015-06-211-10/+26
|\ \
| * | TIF: Add COLUMN_SEARCHABLE to TvContract.ProgramsJae Seo2015-06-191-10/+26
| |/ | | | | | | | | | | | | | | This allows applications to specify not only channels but also programs searchable or not enabling finer grained access control. Bug: 18910284 Change-Id: Id476c37ae8521301c50a4fb2007b41661e74fe89
* | Merge "TIF: Always flush pending app-private commands when resetting TvView" ↵Jae Seo2015-06-211-12/+7
|\ \ | | | | | | | | | into mnc-dev
| * | TIF: Always flush pending app-private commands when resetting TvViewJae Seo2015-06-201-12/+7
| | | | | | | | | | | | | | | Bug: 19809952 Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
* | | TIF: Fix a typoJae Seo2015-06-211-1/+1
| | | | | | | | | | | | Change-Id: Iae3b359369a86224767493149b11d83ba2810ec5
* | | TIF: Remove unnecessary interface modifiersJae Seo2015-06-211-1/+1
| | | | | | | | | | | | Change-Id: I6b0744b32207bece45bc7ac6bee279b244f8cd3b
* | | TIF: Replace StringBuffer with StringJae Seo2015-06-211-6/+2
|/ / | | | | | | Change-Id: I52f7d7cc8af7d230d6a23993391f662542886f37
* | Merge "MediaPlayer: documentation for error/info codes." into mnc-devRobert Shih2015-06-191-0/+18
|\ \
| * | MediaPlayer: documentation for error/info codes.Robert Shih2015-06-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Documented in this change: MEDIA_ERROR_SYSTEM, and MEDIA_INFO_NETWORK_BANDWIDTH Bug: 18237764 Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
* | | Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-devChien-Yu Chen2015-06-191-1/+4
|\ \ \ | |_|/ |/| |
| * | ImageReader: Fix format workarounds for legacy devicesChien-Yu Chen2015-06-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the workaround when returning the format. Remove the workaround in legacy shim that overrides YUV_420_888 to YV12 because allocating YUV_420_888 buffers with SW access is supported on Flo. Bug: 21707937 Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
* | | Merge "audio effect JNI: fix global ref leak." into mnc-devEric Laurent2015-06-192-0/+4
|\ \ \
| * | | audio effect JNI: fix global ref leak.Eric Laurent2015-06-192-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove one more global ref leak in AudioEffect and Visualizer JNI. Bug: 21629892. Change-Id: Id77fc2d10f3dc9d3154d6a1cf0f8cc0f83683584
* | | | Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-devJeff Tinker2015-06-193-4/+49
|\ \ \ \
| * | | | Improve robustness of MediaDrm after mediaserver crashJeff Tinker2015-06-173-4/+49
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If DEAD_OBJECT is returned from binder calls due to mediaserver crash, throw new MediaDrmResetException. This allows the app to detect the condition and handle it properly. bug: 20614102 Change-Id: Id08b08fb612672fd94383f0470f5fa3f267b944f
* | | | Merge "Fix MidiDevice.MidiConnection lifecycle" into mnc-devMike Lockwood2015-06-183-14/+59
|\ \ \ \
generated by cgit v1.1 at 2024-09-10 12:53:33 +0000