11513 Commits

Author SHA1 Message Date
Jean-Michel Trivi
6d5723fe4e Merge "Define stream type for accessibility volume control" 2016-11-22 16:28:48 +00:00
Jean-Michel Trivi
3f0945a608 Define stream type for accessibility volume control
New stream type for accessibility volume.
Add related appOps.

Test: see added CTS tests in AudioManagerTest & Stub
Bug 30448020

Change-Id: I34f96713b22fedf75322b8ffe2b96a7c566f5009
2016-11-21 15:15:45 -08:00
Jeff Tinker
66f6547ba9 Merge "Removing widevine classic" 2016-11-21 17:53:18 +00:00
Wei Jia
a16946abfd Merge "mediaplayer: support same seek mode as MediaMetadataRetriever." 2016-11-18 23:42:23 +00:00
Wei Jia
008fb02824 mediaplayer: support same seek mode as MediaMetadataRetriever.
Test: compiles
Bug: 32557491

Change-Id: Idb4d50505d7708a1402a26f652d0a6966e26bb6b
2016-11-18 11:27:14 -08:00
Hyundo Moon
af18c40b70 Merge "Fix wrong JavaDoc parameter names of ExifInterface.getJpegAttributes()" 2016-11-17 04:49:12 +00:00
Hyundo Moon
89779299f1 Fix wrong JavaDoc parameter names of ExifInterface.getJpegAttributes()
Test: By comparing the parameter names manually.
Change-Id: I3f67e43174754a73d498be6bf2882481cd80a648
2016-11-17 11:44:12 +09:00
Jeff Tinker
d2e9a52b1d Removing widevine classic
bug:30505334
Change-Id: I21ae4808c04b15a5b298c604494b17de436fb250
2016-11-16 02:12:08 +00:00
Jean-Michel Trivi
8e48c6939b Refactor SoundPool for appOps handling through PlayerBase
Modified the signature of the abstract volume methods so
  it is clear at the subclass level whether the volume
  command is for a mute or a volume control.
  Changed the implementations in the subclasses
  accordingly.
Removed appOps handling inside SoundPool and made it
  inherit from PlayerBase.
Moved handling of the camera sound restriction from
  SoundPool to PlayerBase.
Added support in SoundPool native implementation for
  muting, as each player has its own volume.

Test: play a long file with SoundPool and enter DnD mode

Bug: 30955183
Bug: 28249605

Change-Id: I0fcd7480f9a455c06aa4f7092486f5c65bc9d7db
2016-11-14 09:36:11 -08:00
Jeff Sharkey
d0ac9d3bac Merge "Detect non-oneway calls leaving system_server." 2016-11-09 16:51:41 +00:00
Marco Nelissen
2a6aae0857 Drm APIs are in libmediadrm instead of libmedia
Test: build/boot
Change-Id: I4a6929d2d524d5f2f7ffa06f68a3c1041804e125
2016-11-07 16:37:06 -08:00
Jeff Sharkey
0a17db1cc5 Detect non-oneway calls leaving system_server.
To protect system stability, any Binder calls leaving the
system_server must carefully be performed using FLAG_ONEWAY (or
the 'oneway' verb in AIDL) which prevents the call from blocking
indefinitely on the remote process.

In this CL, the system_server uses the new Binder.setWarnOnBlocking()
method to enable detection by default for all remote Binder
interfaces.  It can also use Binder.allowBlocking() to allow
blocking calls on certain remote interfaces that have been
determined to be safe.

This CL adds the 'oneway' verb to several interfaces and methods
where it should have been added, and marks a handful of system
ContentProviders as being safe to call into.  Also, we assume that
any services obtained from ServiceManager are part of the core
OS, and are okay to make blocking calls to.

Test: builds, boots, runs with minimal logs triggered
Bug: 32715088
Change-Id: Ide476e120cb40436a94b7faf7615c943d691f4c0
2016-11-07 17:03:37 -07:00
Marco Nelissen
9a9e54cfb7 Merge "Use libaudioclient" 2016-11-04 21:53:57 +00:00
John Reck
f6113af2d6 Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
2016-11-03 16:26:59 -07:00
Jean-Michel Trivi
ecbf80b62d Merge "MediaRecorder: Fix some audio source descriptions" 2016-11-03 22:34:15 +00:00
Jean-Michel Trivi
5d1828ee40 MediaRecorder: Fix some audio source descriptions
voice recognition: it is always available
camcorder: "main microphone" doesn't mean anything
communication: there is no requirement for this source
  to behave like the default preset.

Test: make offline-sdk-docs
Bug: 32451872

Change-Id: I1a2f196977e547feebb031a98b0f0e560f0557d5
2016-11-03 18:00:50 +00:00
Marco Nelissen
20edcbc89c Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
2016-11-03 10:58:33 -07:00
Wei Jia
e1964aa0cc Merge "mediaplayer: add precise argument to seek function" 2016-11-02 21:03:23 +00:00
Wei Jia
30b684c878 Merge "add libmedia as dependency of invoke_mock_media_player." 2016-11-01 00:39:18 +00:00
Wei Jia
ff85c82bad mediaplayer: add precise argument to seek function
Test: compiles
Bug: 32557491

Change-Id: If4e1cb8bf9ff69023bf79f6b221e11e1896748bf
2016-10-31 17:11:00 -07:00
Wei Jia
170500f5d4 add libmedia as dependency of invoke_mock_media_player.
Test: compiles
Bug: 32524218
Change-Id: I0dfa8d8fb69f0b48824452f362d5dfe877ad9ff8
2016-10-31 13:04:27 -07:00
Marco Nelissen
b3a22bcb76 Remove unneeded libraries from libmedia_jni
Test: built and booted
Change-Id: I9bd8dd0001688eabc0d58563b652eb11a69efba8
2016-10-26 21:20:49 +00:00
Shuzhen Wang
461f767606 Merge "Camera2: Add onCaptureQueueEmpty callback" 2016-10-20 21:36:16 +00:00
Shuzhen Wang
88f1af2410 Camera2: Add onCaptureQueueEmpty callback
onCaptureQueueEmpty indicates that the non-repeating
capture request queue of camera device is empty, and
is ready to process a new request.

Test: testMultipleCapture in PerformanceTest.java

Bug: 29006447
Change-Id: If245ff6abf352548ca13a10fcfbd1550b92c1224
2016-10-18 17:50:17 -07:00
Andy Hung
0564ec9d68 resolve merge conflicts of ffe502b to cw-f-dev am: 3dd656c624
am: c6e0d5f125

Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
2016-10-18 20:18:05 +00:00
Andy Hung
c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
2016-10-18 20:11:21 +00:00
Andy Hung
3dd656c624 resolve merge conflicts of ffe502b to cw-f-dev
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
2016-10-18 11:55:04 -07:00
Sungsoo
9a052fd590 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa am: 815d687215
am: 4090df5b63

Change-Id: If0c1922b0563c8723704e78609f0d7d8e21fb957
2016-10-18 18:03:20 +00:00
Sungsoo
4090df5b63 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa
am: 815d687215

Change-Id: I7a1f157a59f342dfbe8c9b08f387e121d781280a
2016-10-18 17:55:20 +00:00
Sungsoo
815d687215 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3
am: b6f40a84fa

Change-Id: Ia9dbb060111c198774843f753977879f362bf904
2016-10-18 17:47:51 +00:00
Sungsoo
b6f40a84fa ExifInterfaceTest: Catch IOException am: c9ed3b8a5b
am: a4ec9714b3

Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17
2016-10-18 17:42:01 +00:00
Sungsoo
a4ec9714b3 ExifInterfaceTest: Catch IOException
am: c9ed3b8a5b

Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd
2016-10-18 17:31:12 +00:00
Sungsoo
c9ed3b8a5b ExifInterfaceTest: Catch IOException
ExifInterface throws IOException instead of UnsupportedOperationException.

Bug: 32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db
2016-10-19 01:26:37 +09:00
Andy Hung
ffe502bd61 Ringtone: clear the MediaPlayer listener upon completion
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
2016-10-17 18:12:35 -07:00
Mikhail Naganov
c7555a0871 Merge "Split audio effects headers" 2016-10-17 22:22:52 +00:00
Philip P. Moltmann
b828b77985 Properly close USB device connection in Mtp device
Test: Built
Fixes: 32073045
Change-Id: I05179377532c1bd4dff1f4a4e0e837cb645317e3
2016-10-17 11:19:58 -07:00
Mikhail Naganov
49cc2c8483 Split audio effects headers
There can be different use cases with the code that imports
headers from audio_effects (each subsequent case is a more
specialized version of the previous one):

  1. The code only needs access to general structures
     like effect_descriptor_t:
     ==> include system/audio_effect.h
     Example: AudioSystem in libmedia

  2. The code that needs access to effect UUID and parameter
     enums:
     ==> include system/audio_effects/effect_foo.h
     Examples: media framework effects interfaces, libwilhelm

  3. The code that needs to call into HAL:
     ==> include hardware/audio_effect.h
     Examples: libaudiohal (implementation part) and libeffects

  4. The code that implements a particular effect:
     ==> include audio_effects/effect_foo.h
     Examples: cts/.../CTSTestEffect.cpp
               stuff in hardware/, vendor/

Change-Id: I201dfa20ddc7aac797fd35934c0f06658f1e60be
Test: make
2016-10-14 15:31:35 -07:00
Marco Nelissen
e1a81fcc65 Make AmrInputStream use MediaCodec
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
2016-10-14 14:52:10 +00:00
TreeHugger Robot
1bbdac5eb2 Merge "resolve merge conflicts of 3fc6b8f to master" 2016-10-14 02:50:58 +00:00
Sungsoo
4d3a4132c2 resolve merge conflicts of 3fc6b8f to master
Change-Id: I004b34699fd997805d6c37753c48fe1f1d226095
2016-10-14 08:17:19 +09:00
Sungsoo
3fc6b8fd0f ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c
am: b68d0855c4

Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
2016-10-13 22:21:47 +00:00
Sungsoo
b68d0855c4 ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510
am: 36f64a2f0c

Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
2016-10-13 22:11:58 +00:00
Sungsoo
36f64a2f0c ExifInterface: Provide backward compatibility am: 2dbe166801
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
2016-10-13 22:06:01 +00:00
Sungsoo
bc813cd510 ExifInterface: Provide backward compatibility
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
2016-10-13 21:57:22 +00:00
Jean-Michel Trivi
46d5b820d7 Audio stream types: javadoc fix to indicate they're for volume
Fix javadoc for stream types to indicate they are only used for
  volume, not to identify streams of audio.
Do not reference AudioSystem in SDK doc.

Test: make offline-sdk-docs

Change-Id: Id7b84db1f22841c47e9d580c9f71f7765c498b9d
2016-10-13 21:38:44 +00:00
Sungsoo
2dbe166801 ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
2016-10-13 13:06:24 +09:00
Erik Wolsheimer
fdc44dc732 Fix memory leak in Ringtone am: 76ed4ddca0
am: 8d135d53cc

Change-Id: Ieed5a2e27ba53142ceb02a4e6812509beaabb414
2016-10-11 18:31:32 +00:00
Erik Wolsheimer
8d135d53cc Fix memory leak in Ringtone
am: 76ed4ddca0

Change-Id: I7c1167593ba2cc960dbb0b57385c574f5c22f2ad
2016-10-11 18:25:39 +00:00
Erik Wolsheimer
76ed4ddca0 Fix memory leak in Ringtone
BUG: 31938615
Change-Id: Ic736f3494b4da95460bdc0cb7857cc9fcc746ab9
2016-10-11 10:13:23 -07:00
Philip P. Moltmann
7db3055bba Do not access MTP devices when disabled. am: 5201f1e61c
am: c950703424

Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b
2016-10-06 20:05:48 +00:00