3376 Commits

Author SHA1 Message Date
Eric Laurent
91377de6f2 audioservice: fix default stream volume
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
2014-10-27 10:13:00 -07:00
John Spurlock
e828b6c034 Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 2014-10-27 13:31:20 +00:00
John Spurlock
9755937ed9 AudioService: Restore ringer-mode validation check.
Ensure the ringer-mode is valid when set, and forward client calls
to service method to centralize validation.

Bug: 17884168
Change-Id: I500f9beefbce5b7a8bc01ca9eb7b4a7a16114160
2014-10-24 16:45:33 -04:00
Jae Seo
6320fc490f TIF: Notify of size change of the video in TvView
Put the necessary plumbing in place to notify of size change of the
video in TvView.
Put together the track related logic in TvInputManager.Session.
Protected track information with a lock.

Also modified debugging messages more consistently and fixed minor
warnings in TvView.

Bug: 17635300
Change-Id: I8d267d8a11056b5ccee1dacbf2d3391be16f811e
2014-10-24 10:19:08 -07:00
Jae Seo
e41d967c5c Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 2014-10-24 17:02:34 +00:00
Jae Seo
887f52144e TIF: Cache the app private command and send it when connection is made
Bug: 17559793
Change-Id: If785d1ffceb5b5152381818efc4d1c8b5115143c
2014-10-24 10:01:06 -07:00
Dongwon Kang
f6df7bff53 Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 2014-10-24 02:24:18 +00:00
Wonsik Kim
cfc73237e9 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 2014-10-24 01:34:05 +00:00
Dongwon Kang
5168a7a0d3 TIF: exclude tuner TV input not having a setup activity in the input list.
By doing this, developers can notice the flaw of the input in advance.

Bug: 17647146
Change-Id: I123a5538566959320a6201a4d7952e205602a28a
2014-10-24 10:23:13 +09:00
Jae Seo
8ddb01ec7b Update documentation for notifyTracksChanged() and notifyTrackSelected()
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
2014-10-23 06:50:48 +00:00
Wonsik Kim
8f24a8b60f TIF: fix wrong config comparison & confusing method name
TvStreamConfig should do deep comparison in TvInputHardwareManager
where the object gets created from binder calls. In addition to this
fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method
name better reflects what it does.

Bug: 18027719
Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
2014-10-22 16:27:39 +09:00
Dongwon Kang
a6372b3be4 Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 2014-10-22 01:46:33 +00:00
RoboErik
f0a284115a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
2014-10-20 22:14:10 +00:00
RoboErik
59759903a9 Add missing break to switch statement
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
2014-10-20 14:56:32 -07:00
RoboErik
26a4309492 am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
  Set the metadata rating correctly in RCC
2014-10-20 19:13:20 +00:00
RoboErik
38696ba77d Set the metadata rating correctly in RCC
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
2014-10-20 09:48:13 -07:00
Dongwon Kang
49c1b69a56 TIF: add more documentation on Hardware session.
Bug: 17909341
Change-Id: Ie537eb77b6ac4b63e4e9306c1781f84dd4be2719
2014-10-20 18:26:50 +09:00
Marco Nelissen
4683a10f9c am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
2014-10-16 00:41:10 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
2014-10-15 23:40:07 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
2014-10-15 15:36:50 -07:00
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
2014-10-15 13:32:31 -04:00
Dongwon Kang
ba766977f5 TIF: Define more cannonical genres in TvContract
Background: while categorizing broadcast genres into cannonical genres,
it turned out that the existing 11 genres are not enough. 6 more genres
are added.

Bug: 17597747
Change-Id: I14c00771d69f1e30fc2c0e3978298c67066117e5
2014-10-15 11:32:20 +09:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
2014-10-09 19:11:11 +00:00
Chong Zhang
a6ae8ba4a5 MediaHTTPConnection: do not use proxy for localhost
Bug: 17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
2014-10-09 02:07:40 +00:00
Jon Eklund
cb13564554 am 318f0fe4: AudioService: Fix monitorRotation for landscape applications
* commit '318f0fe43bdc4b2f6764edd91d6b78d9875ffdeb':
  AudioService: Fix monitorRotation for landscape applications
2014-10-08 18:15:42 +00:00
Jon Eklund
318f0fe43b AudioService: Fix monitorRotation for landscape applications
Current implmentation only sends rotation updates on orientation
changes, so does not handle direct 0<->180 or 90<->270 transitions.

Update rotation based on an OrientationEventListener instead of
Intent.ACTION_CONFIGURATION_CHANGED

Bug 17606902

Change-Id: I01dfcd1c587f5b2e8a96365c2389782ad77936ef
2014-10-08 01:06:15 +00:00
Jean-Michel Trivi
986468a8ab am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
  Full volume on remote submix for apps that need it
2014-10-07 17:33:05 +00:00
Jean-Michel Trivi
ba5270b887 Full volume on remote submix for apps that need it
If an AudioRecord is created with the "fixedVolume" tag
  when recording from REMOTE_SUBMIX, treat the
  device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
  device during the recording. Also register a death
  handler during the recording.
  Otherwise this is a no-op.

Bug 17635294

Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
2014-10-07 09:09:41 -07:00
Benson Huang
ce4483cb83 [FM] Add FM_TUNER audio source to support L version FM radio app
1.MediaRecorder.java: Add FM_TUNER audio source type for FM record.
    2.AudioRecord.java: For FM output to the other device,
     (except the headset case), record the FM tuner signal to a track
      and playback the recorded signal by a track.
    3.AudioAttributes.java: Thus we use AudioRecord, need to modify
      setCapturePreset to support MediaRecorder.AudioSource.FM_TUNER.

    Review: https://partner-android-review.git.corp.google.com/#/c/182071

    Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: If068d0bbbffb4848887004396a8a8d9bcba1334e
2014-10-06 18:50:12 +00:00
RoboErik
51c07bc0bf Fix regression in RCC.editMetadata(false)
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.

bug:17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
2014-10-03 12:45:58 -07:00
Sungsoo Lim
d3f17921bd Update java doc for content rating systems
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.

Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
2014-10-01 09:41:51 +09:00
Yao Chen
c8a3e0dc9d Assign bindService() result to a boolean directly. One less if-else
Bug: 17637058
Change-Id: If2f4db2ebf95f1912a752794a1ab482cf30ab014
2014-09-27 01:08:39 +00:00
Marco Nelissen
f8c4f9efcb Merge "Validate MTP path" into lmp-dev 2014-09-27 01:03:50 +00:00
Marco Nelissen
5f411696a6 Validate MTP path
Bug: 17673184
Change-Id: I51a64f065d9b3609557af81e596ebeb8720ab6c5
2014-09-26 16:07:49 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
2014-09-26 14:53:06 -07:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
RoboErik
1dc5ba8665 Disable MediaSessionLegacyHelper debugging
Switched over to using Log.isLoggable instead for release.

Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
2014-09-25 14:57:35 -07:00
RoboErik
5535ea8ef8 Remove BT routes when BT is turned off
A behavior change in the BT stack caused it to stop sending connection
changes for connected devices when you turn BT off. To work around this
we need to remove the connected BT route when BT is turned off.

bug:17512270
Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
2014-09-25 14:57:35 -07:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00
Ronghua Wu
e19a80def2 MediaCodecList: fix findEncoderForFormat.
Bug: 17460057
Bug: 17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
2014-09-25 00:17:15 +00:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2)
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
2014-09-24 16:44:47 -07:00
Lajos Molnar
7e28fc7370 Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 2014-09-24 23:40:56 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
Yao Chen
2354c5eb92 Check the return value of bindService, and notify media browser client
onConnectionFailed if it returns false.

Bug: 17637058
Change-Id: I2284c3a982e5ac6323f51ff7d98aae7699c695e5
2014-09-24 21:45:58 +00:00
RoboErik
88b84178d6 Ensure MediaBrowser state is set to connecting after a reconnect
When the binder had disconnected we were setting the state to suspended
and then not setting it back to connecting when we reconnected. This sets
the state correctly when we are trying to connect again.

bug:17593681
Change-Id: I3fe95fa23ba43ac2dc3692fd28309b2f8e5a3599
2014-09-24 14:35:32 -07:00