8569 Commits

Author SHA1 Message Date
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
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
2014-10-24 03:17:24 +00: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
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
2014-10-24 00:47:54 +00:00
Jae Seo
6c9b08478b Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 2014-10-23 06:51:09 +00:00
Jae Seo
8ddb01ec7b Update documentation for notifyTracksChanged() and notifyTrackSelected()
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
2014-10-23 06:50:48 +00:00
Leon Scroggins III
8e8a0d6eaf Remove outdated tests for custom decoder.
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.

Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.

BUG:17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
2014-10-22 18:17:14 +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
01c9d330b7 am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
  Add missing break to switch statement
2014-10-20 22:19:54 +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
d00e68c3b6 am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev
* commit '26a4309492f5af6828738a469ad8f18f42c44a61':
  Set the metadata rating correctly in RCC
2014-10-20 19:20:32 +00: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
a2d77ed7d7 am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths
2014-10-16 17:45:36 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
2014-10-16 05:51:45 +00: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
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
2014-10-09 19:17:29 +00: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
6f030aa0d9 am cb135645: am 318f0fe4: AudioService: Fix monitorRotation for landscape applications
* commit 'cb13564554e6b61de6f37afbeb6ddb368cee31dc':
  AudioService: Fix monitorRotation for landscape applications
2014-10-08 18:25:47 +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
63b6d3ed1d am 986468a8: am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev
* commit '986468a8ab77ce1e89247078d4e93a3aaa5d294b':
  Full volume on remote submix for apps that need it
2014-10-07 17:42:58 +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
1e62e476fa am ce4483cb: [FM] Add FM_TUNER audio source to support L version FM radio app
* commit 'ce4483cb83afb3a42a32ef2cb00cf04d6f9018fd':
  [FM] Add FM_TUNER audio source to support L version FM radio app
2014-10-06 18:54:19 +00: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
49c14438fd am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '2d553e95c9e16fd37a676acaf1960e9d919c3caf':
  Fix regression in RCC.editMetadata(false)
2014-10-03 21:33:05 +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
Mike Lockwood
63ffd78aaa MtpDatabase: Increase size of string buffer in JNI code
Fixes problems handling files that have full path length > 255 characters

Bug: 17383223
Change-Id: I2a1ebedee8dd86b3060f14c2d1af636fc9bc95cb
2014-10-03 17:54:18 +00:00
Sungsoo Lim
ee33c661ef Merge "Update java doc for content rating systems" into lmp-dev 2014-10-01 01:46:26 +00: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
Ruben Brunk
0c79884076 camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Bug: 17675571

- All of the mistakes were made.  Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
2014-09-30 13:54:20 -07:00
Ruben Brunk
7b28c66a6c Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev 2014-09-27 02:16:30 +00: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
Ruben Brunk
31798f3318 camera2: Fix native ImageReader test segfaults.
Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
  when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
  incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
2014-09-26 18:00:21 -07: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