Commit Graph

6797 Commits

Author SHA1 Message Date
android-build-team Robot
65253b5144 Merge "Fix documentation bug that breaks generation" into pi-dev am: 353a9bc4bf
am: 021e9e8f35

Change-Id: I77a55b4ed47b5eeb174b99a662e32fb593d7ec10
2018-04-27 17:07:32 -07:00
android-build-team Robot
353a9bc4bf Merge "Fix documentation bug that breaks generation" into pi-dev 2018-04-27 23:46:07 +00:00
Marco Nelissen
8be6c780e3 Merge "Don't treat failed scans as valid media files" into pi-dev am: e4dc997cf6
am: fdfeece6f9

Change-Id: I59e7877ac1da0b4c0f8ce13ecfd291d6e6ed4863
2018-04-27 14:53:45 -07:00
Marco Nelissen
bab75909fa Don't treat failed scans as valid media files
Instead, add them to the MediaProvider as non-media files.
Bug: 77656952
Test: manual, CTS

Change-Id: I3b72b3e28f481b6775349337588225daeacbe552
2018-04-25 14:39:04 -07:00
TreeHugger Robot
63b534768e Merge "Remove PendingIntent based soundTrigger" 2018-04-25 21:29:06 +00:00
Jeff Tinker
af71bb69e1 Fix documentation bug that breaks generation
bug:78536565
Change-Id: Ic30762459e888c355e5995067377486b8ac34557

Test:make offline-sdk-docs
2018-04-25 19:22:59 +00:00
Jin Seok Park
e164543267 Merge "ExifInterface: Prevent infinite loop" into pi-dev am: 6cc4575ced
am: bedf1e4560

Change-Id: I68a6e502817d30443a69edc228b5ba803918f086
2018-04-19 20:24:36 -07:00
TreeHugger Robot
6cc4575ced Merge "ExifInterface: Prevent infinite loop" into pi-dev 2018-04-20 02:43:54 +00:00
Jin Seok Park
12e7aa5882 ExifInterface: Prevent infinite loop
A corrupted image file may create two problems.
1. A corrupted IFD pointer may point to an IFD that has already
been read, thus creating an infinite loop and a stack overflow.
2. A corrupted IFD offset value may have a negative value, thus
prompting a random reading of the file and creating an infinite
loop.
This CL addresses these issues.

Bug: 63800695
Test: Run cts (ExifInterfaceTest)
Change-Id: I706a0c3eae6af8301af69407333ea88e5681df3c
2018-04-20 10:36:00 +09:00
Chong Zhang
9216cab46c Merge "Use heif embedded thumbnail if available" into pi-dev am: 11d203ea0d
am: a55a0da8d5

Change-Id: Ifa0e3c5ec1114b50d9b9b9860aec87dff718d551
2018-04-14 19:18:21 -07:00
TreeHugger Robot
11d203ea0d Merge "Use heif embedded thumbnail if available" into pi-dev 2018-04-14 00:23:37 +00:00
Dongwon Kang
b5f88e7e30 Merge "Merge "Use system property to get the package name for media update" into pi-dev am: fd3e190cbf" into pi-dev-plus-aosp
am: 8845722905

Change-Id: I36b09cf6b75932aa978c603c6d29ad0f87dad8e9
2018-04-12 16:53:24 -07:00
TreeHugger Robot
fd3e190cbf Merge "Use system property to get the package name for media update" into pi-dev 2018-04-12 20:54:46 +00:00
jiabin
f8817064c1 Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev am: ccaba49ab5
am: b2d12fb3e0

Change-Id: I618e5250bf4416fa1de34bad57677d25167ec6a7
2018-04-12 11:45:35 -07:00
TreeHugger Robot
ccaba49ab5 Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev 2018-04-12 17:05:12 +00:00
Chong Zhang
ba07cc25b6 Merge "Fix missing video caps for HEIC type encoders" into pi-dev am: 773791a94c
am: 26bedfe43e

Change-Id: I73bee318babe8063941d1e1230ad197ae36c0885
2018-04-12 03:26:50 -07:00
TreeHugger Robot
773791a94c Merge "Fix missing video caps for HEIC type encoders" into pi-dev 2018-04-12 09:59:28 +00:00
Sungsoo Lim
3d1b7ee8b2 Merge "Fix possible NPE in MediaSessionManager" into pi-dev am: ed01dfba3e
am: ae93c58779

Change-Id: I0abefe0e3bcf5246b454ece637007ce7fa6f83e3
2018-04-12 00:13:37 -07:00
TreeHugger Robot
ed01dfba3e Merge "Fix possible NPE in MediaSessionManager" into pi-dev 2018-04-12 06:51:52 +00:00
Jean-Michel Trivi
c043e79b8c Merge "PlayerBase: fix deadlock" into pi-dev am: 437b252c96
am: 1f1a955bf9

Change-Id: Idf8726ae5c5395fdce4bf8723542bd1f95c842e0
2018-04-11 19:30:38 -07:00
TreeHugger Robot
437b252c96 Merge "PlayerBase: fix deadlock" into pi-dev 2018-04-12 01:46:52 +00:00
Jean-Michel Trivi
76e124bcd3 PlayerBase: fix deadlock
Source of deadlock between PlayerBase.mLock and
  PlaybackActivityMonitor.mPlayerLock:

android.media.MediaPlayer.release()
> android.media.PlayerBase.baseRelease()
  > synchronized (mLock)
    > com.android.server.audio.PlaybackActivityMonitor.releasePlayer()
       > synchronized(mPlayerLock)
and:

com.android.server.audio.PlaybackActivityMonitor.unmutePlayersForCall()
> synchronized (mPlayerLock)
  > android.media.PlayerProxy.setVolume()
    > android.media.PlayerBase$IPlayerWrapper.setVolume()
      > android.media.PlayerBase.baseSetVolume()
        > synchronized (mLock)
          playerSetVolume()

Since system_server can have its own players, the calls to
 AudioService from PlayerBase can be synchronous, hence the
 deadlock.
The fix consists in never holding the lock in PlayerBase
 while calling into AudioService.
Refactor the playstate update into a method used for
 start / stop / pause.

Bug: 72294559
Test: see bug

Change-Id: I6451aa3bf19a0365472ba007b116a9e6151ab33e
2018-04-11 17:22:59 -07:00
Chong Zhang
7d12714020 Use heif embedded thumbnail if available
Use the heif embedded thumbnail as long as it's not
too small to avoid decoding the full image and downscale.

bug: 74395267
Test: CTS MediaMetadataRetriever test; manual test of thumbnail
extraction by browsing new folders containing heif files in
Downloads app.
Change-Id: I5b2be0521452376153a773cb7671fefe7f9bc439
2018-04-12 00:08:57 +00:00
jiabin
a26a76230f Change log level when microphone enumeration APIs native call fail.
For microphone enumeration APIs, it could fail due to hal v2,
which is WAI. We shouldn't log as error. Using warning instead.

Bug: 64038649
Test: build
Change-Id: I1a64b8537e27e712a09f122d4763e0e5a345b08f
2018-04-11 16:18:51 -07:00
Wei Jia
f343c4918b Merge "BufferingParams: add annotation @TestApi" into pi-dev am: fb052cc3c0
am: bfd7f564d0

Change-Id: Icc721ee3fd658ab503f60a45f2e8f7fd34e7a1d4
2018-04-11 12:42:48 -07:00
TreeHugger Robot
fb052cc3c0 Merge "BufferingParams: add annotation @TestApi" into pi-dev 2018-04-11 18:01:24 +00:00
Chong Zhang
93cf8b260e Fix missing video caps for HEIC type encoders
Bug: 63633199
Bug: 74343403
Change-Id: If1faff529aadce62566fe45a8b758e574e215154
2018-04-11 10:29:12 -07:00
jiabin
38da6cc167 Merge "Fix mic enumeration CTS fail on marlin." into pi-dev am: 0b5dd8e560
am: 76e69b0812

Change-Id: Id7580ece4bc0da834424f4e21fcae99ac5ae53c1
2018-04-11 09:12:10 -07:00
TreeHugger Robot
0b5dd8e560 Merge "Fix mic enumeration CTS fail on marlin." into pi-dev 2018-04-11 15:46:49 +00:00
Sungsoo Lim
3715ec579a Fix possible NPE in MediaSessionManager
Bug: 77885219
Test: build
Change-Id: Id20dd73f00521beeccd4704f722547ba32bb5722
2018-04-11 17:16:15 +09:00
jiabin
d0be5b212f Fix mic enumeration CTS fail on marlin.
The mic enumeration APIs only support on audio hal v4. Marlin failed due
to on audio hal v2. Make the APIs return mic with unknown
characteristics if the native call fail.

Bug: 77732156
Bug: 77732289
Test: run cts on marlin and walleye
Change-Id: I64b3e6a249ad76b754e841d630e8cf178dde9a86
2018-04-10 14:44:41 -07:00
Wei Jia
5d78d87493 BufferingParams: add annotation @TestApi
Test: CTS test passed
Bug: 77723586
Change-Id: I3811f16380f6465f884d6dd84ce969a0a5886107
2018-04-10 10:45:44 -07:00
Jean-Michel Trivi
fbb05ff5c5 Merge "AudioAttributes: handle unknown usage like media" into pi-dev am: 9dbe4d8e6b
am: 3a8ddbcc8a

Change-Id: Ib46af5746bce8d8cfb1150ccd3e792d3bde6db73
2018-04-09 18:42:50 -07:00
Jean-Michel Trivi
6d38a1b260 AudioAttributes: handle unknown usage like media
In the native audio policy management, the default stream type
  for volume is STREAM_MUSIC, i.e. any player by default is
  considered a "media" player. Do the same for audio attributes
  with regards to suppressible behaviors.

Bug: 74052135
Test: ZenModeHelperTest + see bug
Change-Id: I8f65044807fd3e745f21e031a0aa01a5e6f74cd2
2018-04-09 21:24:25 +00:00
Andy Hung
2ce1cc111f Merge "PlaybackParams: Add @TestApi annotation to access stretch mode" into pi-dev am: 30a0d29107
am: b7b018ef50

Change-Id: Ie62784237193baed9817cb0f468b39e222123300
2018-04-09 10:18:10 -07:00
Andy Hung
8ec4be4be9 PlaybackParams: Add @TestApi annotation to access stretch mode
Required due to CTS access restrictions in P.

Test: CTS ParamsTest
Bug: 77723867
Change-Id: I68b5fbc2096d5d1cb01c60fe1028def5ecfe2959
2018-04-06 19:23:53 -07:00
Jean-Michel Trivi
803a190669 Merge "AudioFocusRequest: getOnAudioFocusChangeListener in test API" into pi-dev am: 301a925597
am: 4a09bab517

Change-Id: Ia3346aa5ec6a4b263120e8a650cf93d32fd19b06
2018-04-06 19:19:35 -07:00
Jean-Michel Trivi
d043c3aba0 AudioFocusRequest: getOnAudioFocusChangeListener in test API
Bug: 77651038
Test: CTS AudioFocusTest
Change-Id: I071057f1ed0ed6c56c16182a48191d763d408ae1
2018-04-06 16:59:21 -07:00
Mikhail Naganov
be9301e9ae Merge "AudioPresentation: Replace @VisibleForTesting with @TestApi" into pi-dev am: d1bc30a405
am: 163b606b0a

Change-Id: Id44d1c49e6f7308498c949a5e42e93a27c0cd32a
2018-04-06 16:33:28 -07:00
Mikhail Naganov
436ee82422 AudioPresentation: Replace @VisibleForTesting with @TestApi
This is to fix CTS tests failures.

Bug: 77715867
Test: make
Change-Id: I99a5ff8fab208a0e1f2e889cb7ad256e6ba08437
2018-04-06 13:30:28 -07:00
Andy Hung
165b66c23b Merge "Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev am: 320c1ade67" into pi-dev-plus-aosp
am: 4568c4b9b8

Change-Id: I3b75a28876b8e9f4d110df2c7f9e6019a49d44b2
2018-04-06 12:08:39 -07:00
Andy Hung
320c1ade67 Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev 2018-04-06 18:19:48 +00:00
Emilian Peev
85f27d43de Merge "media: Populate Image scaling mode in reader and writer" into pi-dev am: 893c5e0c70
am: 0a0bb2b1a0

Change-Id: I7b613ca29e28ee0ccbd35e800a2ba315b044b774
2018-04-06 10:41:31 -07:00
TreeHugger Robot
893c5e0c70 Merge "media: Populate Image scaling mode in reader and writer" into pi-dev 2018-04-06 17:06:44 +00:00
Emilian Peev
750aec6f3b media: Populate Image scaling mode in reader and writer
"ImageReader" and "ImageWriter" must pass information about the
specific buffer scaling mode.

Bug: 76022384
Test: Manual using application,
Camera CTS

Change-Id: I116f00cbf3b1487d8e44661e8fd15e2aa16e6e0d
2018-04-06 13:01:45 +01:00
Chong Zhang
a683dc3e98 Merge "Extract exif data from mp4 extractor if available" into pi-dev am: 0c42369361
am: 5f15f4734c

Change-Id: I6808f79e8e424a95b05b430a6986b949bb2e57a3
2018-04-05 22:41:06 -07:00
TreeHugger Robot
0c42369361 Merge "Extract exif data from mp4 extractor if available" into pi-dev 2018-04-06 05:13:33 +00:00
Andy Hung
3ce023b02e Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper
Test: AudioEffectTest
Test: AudioRecordTest
Test: AudioTrackTest
Test: AudioTrackSurroundTest
Test: AudioTrack_ListenerTest
Test: BassBoostTest
Test: EnvReverbTest
Test: EqualizerTest
Test: LoudnessEnhancerTest
Test: PresetReverbTest
Test: VirtualizerTest
Test: VisualizerTest
Test: VolumeShaperTest
Bug: 77652246
Bug: 77651563
Bug: 77652497
Change-Id: I3a95cb6834fac0cd0cb88ea3ed0ba028aeddb3f2
2018-04-05 20:28:33 -07:00
Dongwon Kang
4a649366d5 Use system property to get the package name for media update
Also, disabled updatable apk usage on Media2 APIs since
they are hidden and they shouldn't be used in P.

Test: build and boot on aosp and non-aosp build
Bug: 67908547
Change-Id: Ic93cc0f07604020ec47be25725b05af8a9794572
2018-04-05 16:45:05 -07:00
Philip P. Moltmann
19402f557b Remove PendingIntent based soundTrigger
How that we have the SoundTriggerDetectionService we don't need the
pending intent based mechanism anymore.

Test: Checked that ambient music still detects music
Change-Id: If16c59028b31ff7d2e7f4d7f764460ac948ba946
Fixes: 73829108
2018-04-05 16:32:59 -07:00