8827 Commits

Author SHA1 Message Date
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
2014-09-19 16:13:49 -07:00
Christoph Studer
b5245d8904 SysUI: Correctly compare MediaControllers
Instead of comparing MediaControllers via reference equality
(which is never true), go deeper and check whether the two
controllers are connected to the same IBinder.

Bug: 17571414
Change-Id: Id25d70be0a60d1900e977310dedcc7063552e018
2014-09-19 16:55:45 +02:00
Jungshik Jang
55eef07db6 am d4fcdd1f: am 85467640: am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
* commit 'd4fcdd1fef11beaa81621d3eff93c52b7ba3f0db':
  Adjust volume bar visibility in HDMI-CEC system audio mode
2014-09-17 02:24:06 +00:00
Jungshik Jang
1a6be6ed39 Adjust volume bar visibility in HDMI-CEC system audio mode
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
   Audio Receiver.

Otherwise, (system audio mode off) follows normal TV's behavior.

Bug: 17347499

Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
2014-09-17 10:28:40 +09:00
Andrew Lee
fb748b69d4 am 5325e9bf: am 2167e7dd: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev
* commit '5325e9bf00c1a0b057cd66ede9f5ef10ee6c7f1e':
  Add new DisconnectCause class to telecomm.
2014-09-16 22:18:08 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm.
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
2014-09-16 12:07:41 -07:00
Jungshik Jang
1ac03738be am a5600691: am a7287581: am 8904a3c6: Merge "Fix volume change failure in HDMI-CEC system audio mode." into lmp-dev
* commit 'a5600691e2ffe449422333a86edc1798a678411f':
  Fix volume change failure in HDMI-CEC system audio mode.
2014-09-16 09:12:43 +00:00
Jeff Tinker
1db9c4145a am 96534140: am e05de24f: am 2596d6de: Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev
* commit '9653414015e185787a475bebcc5a99063b9dd54b':
  Document retry behavior for MediaCodec.CryptoException
2014-09-16 09:11:37 +00:00
Jungshik Jang
c9ff968787 Fix volume change failure in HDMI-CEC system audio mode.
In order to get volume change event, output device should not be
in fixed volume device. This change ignores CEC releated outputs
if system audio mode is on.

Along with this, fix invalid output from getStreamForDevice
as AudioPolicManager does.

Bug: 17502272
Change-Id: I7d4406caea7fa6617f17969dc61aabebb87ecf7d
2014-09-16 10:12:41 +09:00
Jeff Tinker
a526ba1217 Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev 2014-09-15 23:37:08 +00:00
Jeff Tinker
6998c37139 Document retry behavior for MediaCodec.CryptoException
bug: 17469693
Change-Id: I8cc204938b28451c638be017ebb499f525fcff50
2014-09-15 11:47:16 -07:00
Jae Seo
84f839d0f2 am 747b198c: am c3bfd9bd: am c07446f2: TIF: Turn debugging off
* commit '747b198cfff6b9813bdb385e7fc370efce5e747a':
  TIF: Turn debugging off
2014-09-14 18:11:44 +00:00
Jae Seo
ee2ec05ed7 TIF: Turn debugging off
Bug: 17476383
Change-Id: I28ff54a635bf6468c231efe776dbc8e35460d542
2014-09-14 10:30:05 -07:00
Tyler Gunn
cc616bca0d am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
2014-09-13 18:19:31 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Jean-Michel Trivi
2196c621af am ec6da7d1: am 4305f912: am 3d88a9c6: Merge "more AudioAttributes javadoc" into lmp-dev
* commit 'ec6da7d1182fc8d103ec0ba5d4866e9ed90bfcd2':
  more AudioAttributes javadoc
2014-09-13 03:06:40 +00:00
Jae Seo
64f1a1ed6f am 24cd42b3: am 2cc0f40f: am 5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev
* commit '24cd42b36c8dd868c11dd5e0384eca4a4a3ac087':
  TIF: Add a system API to retrieve HDMI device information
2014-09-13 03:06:23 +00:00
Jean-Michel Trivi
ebc51ac766 am fea99584: am 2b365e11: am 6b3b63e2: Merge "AudioService: modify stream delay for touch exploration" into lmp-dev
* commit 'fea995846bed70a5d58ec433fe5a996f1e4e24c8':
  AudioService: modify stream delay for touch exploration
2014-09-13 02:16:33 +00:00
Jean-Michel Trivi
f47ff5bf97 Merge "more AudioAttributes javadoc" into lmp-dev 2014-09-12 23:45:23 +00:00
Jae Seo
3c8e65a307 TIF: Add a system API to retrieve HDMI device information
Bug: 17487782
Change-Id: I53995735fa190c40819ff352a8b98765a6f7753f
2014-09-12 16:17:51 -07:00
Jean-Michel Trivi
04f55a490d more AudioAttributes javadoc
Expand the AudioAttributes and associated Builder javadoc.

Bug 17059703

Change-Id: I81b8d48a3b5b3c203f02da3e37228e5ef7b5451d
2014-09-12 15:56:46 -07:00
Michael Wright
dfb309b870 am b04d7260: am 4b5e1fbe: am 54bc6182: Change callback methods from add to register.
* commit 'b04d72602b06aa33034b17c9f29b8abba34644c5':
  Change callback methods from add to register.
2014-09-12 19:22:19 +00:00
Jean-Michel Trivi
20380f44a3 am 0edbe3ea: am 025f0ad2: am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev
* commit '0edbe3ea1d5e0e231416e18a4648892cda223f4b':
  More android.media.AudioFormat.Builder javadoc
2014-09-12 19:17:43 +00:00
Jean-Michel Trivi
873cc45da2 AudioService: modify stream delay for touch exploration
When accessibility services are running, in particular touch
 exploration, the default stream override delay in AudioService
 makes it hard for the user to change the notification volume
 as when TalkBack speaks, the user would control the media
 volume during the utterance, and up until 5s after its end.
Use a shorter delay when touch exploration is enabled.

Bug 17140435

Change-Id: Iabadb9778f2957b5aa0aebd1599f2d69bd83222b
2014-09-12 10:26:24 -07:00
Dan Albert
88ba339aef Clean up makefile cruft.
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
2014-09-11 16:21:19 -07:00
Michael Wright
cde5bb45cc Change callback methods from add to register.
Also changes intent returning method from get to create. Both changes
are in response to API council feedback.

Bug: 17389882
Change-Id: I3b57e3fc202148e3bbb24ac61229f04e8b4ac41e
2014-09-11 19:37:30 +00:00
Youngsang Cho
3ebd8b021e am f5ccdcd5: am d82c7daf: am 4608b9d9: Fix build breakage
* commit 'f5ccdcd5adc653f9b0e39b7d17fc758542866800':
  Fix build breakage
2014-09-11 17:28:54 +00:00
Terry Heo
3d3af205fb am 29f8cb8f: am 5fce06fb: am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev
* commit '29f8cb8f9f5cdbae3f856c474c62e2f86cf6c429':
  Add a system API to query hdmi system audio mode
2014-09-11 17:28:34 +00:00
Chulwoo Lee
2f42f85c5c am d94bbae8: am a6e66231: am cacba761: Notify of the update of TvInputInfo
* commit 'd94bbae86626e0a7c1f3e2554845fb6e1fcc570d':
  Notify of the update of TvInputInfo
2014-09-11 17:28:29 +00:00
Lajos Molnar
10d9fbed46 am f84d5a47: am 1018d8f7: am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor
* commit 'f84d5a472c98ca8edfb7f8720c745ba424322775':
  MediaCodec.Image: use image.setCrop() in constructor
2014-09-11 17:28:00 +00:00
Eric Laurent
c206aa58fe am 7a3c88e0: am 6bc4e4b4: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev
* commit '7a3c88e004b664d3bb20b56b029d29d629541399':
  AudioEffect JNI: fix queryEffects()
2014-09-11 17:25:51 +00:00
Jae Seo
0008debbb8 am 3e420539: am 1bb8ff97: am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices
* commit '3e420539fae35ed10a9ee3f10594c69201e75d25':
  TIF: Enable inflating class android.media.tv.TvView on non-TV devices
2014-09-11 17:22:25 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Jean-Michel Trivi
ce6ec6d256 am c60cf440: am 16c67b4d: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev
* commit 'c60cf440d6ef03f18cbcec8987da8fb5aa230fad':
  Virtualizer: replace device type by virtualization mode
2014-09-11 14:15:28 +00:00
Eric Laurent
62462e4c1b am 31b26c08: am 728f1ba3: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev
* commit '31b26c08f22b8fae6012460fa234792fbfaee473':
  Hide AudioDevice class
2014-09-11 14:15:22 +00:00
Youngsang Cho
db8f7ab752 Fix build breakage
Change-Id: Ic52e2d767f3adfedfa4e78aa2510d480c537c857
2014-09-11 11:22:07 +09:00
Terry Heo
d608f3abac Merge "Add a system API to query hdmi system audio mode" into lmp-dev 2014-09-11 01:35:07 +00:00
Chulwoo Lee
19ba61affb Notify of the update of TvInputInfo
The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
   available.
3. the media on which a newer version of TV inputs exists become
   unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
2014-09-11 10:32:00 +09:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
2014-09-10 17:58:09 -07:00
Eric Laurent
ea9aa9a282 Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev 2014-09-10 22:37:26 +00:00
Eric Laurent
4fc28d78cb AudioEffect JNI: fix queryEffects()
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.

Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
2014-09-10 15:05:03 -07:00
Jae Seo
9127e4580c TIF: Enable inflating class android.media.tv.TvView on non-TV devices
Needed to pass the CTS for those devices.

Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
2014-09-10 13:11:13 -07:00
Jean-Michel Trivi
f35423bb4e Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 2014-09-10 17:29:20 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Zhijun He
01b4bc1054 am d7332411: am 490f790b: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
* commit 'd73324116a59b5ad9fcfcc8721db613e7d76f4c1':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
2014-09-10 07:23:09 +00:00
Lajos Molnar
39e977834d am f152b6e5: am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev
* commit 'f152b6e557a785eeca19041001167b1dba34f08d':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
2014-09-10 07:22:57 +00:00
Robert Shih
c434010e30 am b840ec70: am 8bad28ef: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start
* commit 'b840ec70c54672c8435f67f93b6fc03156208098':
  MediaPlayer/SubtitleController:fix add/select timed text on start
2014-09-10 07:22:48 +00:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
2014-09-10 01:33:17 +00:00