8392 Commits

Author SHA1 Message Date
Jeff Tinker
67085e1cac Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 2014-08-29 01:45:25 +00:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
2014-08-29 08:58:30 +09:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
2014-08-28 14:19:25 -07:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
2014-08-28 21:11:22 +00:00
Shaohan Zou
18b80d2a0d Merge "Add Media Player Streaming Tests" into lmp-dev 2014-08-28 21:00:33 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
John Spurlock
2b29bc4c1c Enhance audio service dumpsys.
- Add device name for keys
 - Add max volume for streams
 - Add missing stream name constant

Bug:16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
2014-08-28 12:20:05 -04:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
2014-08-27 21:52:07 -07:00
Shaohan Zou
d097e7ef74 Add Media Player Streaming Tests
Change-Id: I4bb78b0487d158f4ea57349b591f66eda6b325d2
2014-08-27 17:36:51 -07:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
2014-08-27 14:40:02 -07:00
Jean-Michel Trivi
84e18ecd4b android.media.Ringtone: add getter for AudioAttributes
Bug 17290606

Change-Id: I28406080cc1fb6a916b2859d0ef39980464953e9
2014-08-27 14:32:17 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
2014-08-27 12:36:33 -07:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
2014-08-27 11:08:18 -07:00
Jeff Tinker
2979986b57 Fix exception message string formatting in MediaDrm
bug: 17281760
Change-Id: If527234d2efb1507eca8703027e3cbdd53961b9e
2014-08-27 11:05:13 -07:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
2014-08-27 02:55:10 +09:00
Jae Seo
b2835e2700 TIF: Make TV content rating names consistent
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
2014-08-26 10:08:56 -07:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
2014-08-26 23:12:59 +09:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
2014-08-26 21:30:26 +09:00
Chulwoo Lee
984d99b584 Fix checking trackId
BUG: 17261638
Change-Id: I141b7c9de1289c49f29d2f1e1ac534045abb333d
2014-08-26 11:29:17 +09:00
Jean-Michel Trivi
9e477e4084 More AudioManager.generateAudioSessionId() javadoc
Expand the javadoc for AudioManager.generateAudioSessionId() to
 describe what audio session IDs are used for.

Bug 17059255

Change-Id: I7a8764fd12fa332af747c4d584b0079e80bacf44
2014-08-25 17:55:07 -07:00
Jean-Michel Trivi
2d17128f6e SoundPool.Builder: document default values
Complete javadoc for android.media.SoundPool.Builder to document
 what the default values are.

Bug 17059255

Change-Id: I966e9ed00ed75a78c9b4741b7f68bae996442cdf
2014-08-25 16:48:24 -07:00
Dongwon Kang
f178c14919 Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 2014-08-25 23:44:34 +00:00
Dongwon Kang
c88b8f8722 TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
Bug: 17241260
Change-Id: Ib82ed9fb98f13e31cdf70a3bb273384abcf1b33a
2014-08-26 08:41:40 +09:00
John Spurlock
d38eeb5512 Merge "QS: Wire up screen casting to tile/panel." into lmp-dev 2014-08-25 22:35:25 +00:00
Nancy Chen
e4b1d57dfd Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 2014-08-25 22:24:09 +00:00
John Spurlock
78b8c8fbde QS: Wire up screen casting to tile/panel.
Use MediaProjectionManager to determine whether or not
screencasting is active, when it changes, and to stop
casting.

Also:
 - Implement hashCode/equals on MediaProjectionInfo
 - Fix unintentional recursion in the service.

Bug:16488053
Change-Id: Icd1a88f23bbdf1d4c1915b30cb2508f8fe9d6d7e
2014-08-25 17:55:08 -04:00
RoboErik
cc3e5d5cd1 Merge "Ensure current volume is current" into lmp-dev 2014-08-25 20:20:54 +00:00
Nancy Chen
0eb1e402c7 API review PhoneManager -> TelecommManager. Rename methods (6/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I7d573e27ed093f2ddb7849703cc62f9916835393
2014-08-25 10:50:44 -07:00
Wonsik Kim
8d0b268e42 TIF: define hidden channels columns as @SystemApi
Bug: 17165479
Change-Id: Ic0b0bdbc440eb15e68e4a1a5fa15a4875b17d061
2014-08-25 14:21:40 +09:00
RoboErik
7e2b3008f1 Ensure current volume is current
This sets the current volume when a session is switched over to
remote playback. Otherwise it won't be current until it changes and
sends an update.

Change-Id: Iabedb24a34e88308e7e3c56a2b1ab279a17b466b
2014-08-22 14:39:36 -07:00
Lajos Molnar
a802e26d08 Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 2014-08-22 19:38:23 +00:00
Jae Seo
ae06aec9bb Merge "TIF: Fix comments in TvContentRating" into lmp-dev 2014-08-22 18:41:32 +00:00
Jae Seo
ceb51abc74 TIF: Fix comments in TvContentRating
Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8
2014-08-22 11:27:10 -07:00
Youngsang Cho
e91f83c88e Merge "Send notification messages immediatelly" into lmp-dev 2014-08-22 15:54:12 +00:00
Youngsang Cho
9044be13dc Send notification messages immediatelly
Notification messages are posted through a handler with a main thread.
When a caller of TIS.notifyXXX runs also in a main thread, the notification
is delivered after the method including the caller is finished.
So we added runOnMainThread and made notification messages sent through
runOnMainThread.

Change-Id: Ieb2c5c04ff031e42a532acfc45e0174563265c6b
2014-08-23 00:53:31 +09:00
Lajos Molnar
6ac9da6b18 MediaCodeInfo: fix support for feature-can-swap-width-height
Also fix an issue with limiting size based on number of
blocks allowed.

Bug: 11990740
Change-Id: I3b01be4031dce6b425e8573da5de527ba2a0995c
2014-08-21 16:24:27 -07:00
Lajos Molnar
c54a76cbcd Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 2014-08-21 23:05:28 +00:00
Ronghua Wu
c90c7d257c Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 2014-08-21 22:24:16 +00:00