12007 Commits

Author SHA1 Message Date
Yuchen He
44a2b5723c Merge "Fix AeModeAndLock test cases. Bug: 36103813" 2017-05-15 21:41:30 +00:00
Jeff Tinker
dffb216140 Merge "Fix drm hal resource leaks" into oc-dev am: 63398bbd71
am: 8b1e0e1254

Change-Id: I14d864345f84d801aef48b45af1c59a1e08f7087
2017-05-15 20:14:15 +00:00
Jeff Tinker
8b1e0e1254 Merge "Fix drm hal resource leaks" into oc-dev
am: 63398bbd71

Change-Id: Iae4c7f407e638dd2dba5acfc43a3ca894f665bd4
2017-05-15 20:03:16 +00:00
Jeff Tinker
94dd36cae9 Fix drm hal resource leaks
bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: Ic6a29572874a9fe30f36e7fdabb68d2ddeffb278
2017-05-15 09:27:18 -07:00
Robert Shih
d4e79f09d8 Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev am: ffb563d82d
am: 6033c043ff

Change-Id: I7879b4b76a202dce3cebad1ad37aac3ddb599278
2017-05-12 06:14:39 +00:00
Robert Shih
6033c043ff Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
am: ffb563d82d

Change-Id: I9762506997220b4f22589cc3c6542798175d873c
2017-05-12 02:28:18 +00:00
Yuchen He
e256bc9f66 Fix AeModeAndLock test cases.
Bug: 36103813

Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
2017-05-11 18:55:08 -07:00
TreeHugger Robot
ffb563d82d Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev 2017-05-11 22:40:38 +00:00
Robert Shih
f31d11341e AudioCapabilities: handle non-standard codec max input channels
Bug: 34073927
Change-Id: Id9b99e572bf9c90fa236b762620fb7f6eb284f1e
2017-05-11 13:03:25 -07:00
TreeHugger Robot
424e328bba Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev 2017-05-11 03:55:40 +00:00
Santos Cordon
b0608636a2 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
Merged-In: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
2017-05-11 01:52:53 +00:00
Santos Cordon
527b92c8d8 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" 2017-05-11 01:48:26 +00:00
TreeHugger Robot
baed8c1321 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp 2017-05-10 21:18:51 +00:00
Santos Cordon
023b6b9d23 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
2017-05-10 13:03:32 -07:00
Jean-Michel Trivi
4ba5258d33 Merge changes from topic 'mediaplayer_gc' into oc-dev am: f86d68d447
am: f92b4ec5b0

Change-Id: I80613c2fa0ded16c846a8168e44c7f3f30e15d99
2017-05-10 17:18:33 +00:00
Jean-Michel Trivi
f92b4ec5b0 Merge changes from topic 'mediaplayer_gc' into oc-dev
am: f86d68d447

Change-Id: I01f8c26e9a61f8ed5dd6f0b3a12d245001756796
2017-05-10 16:50:19 +00:00
Christine Franks
c5eb0d222e Merge "Allow ogg files to be selected as ringtones" into oc-dev am: d44afb99c8
am: c8ae9d5a60

Change-Id: I878d4dce0113535d43b9cdc9fb7d230bb38082b7
2017-05-10 16:22:27 +00:00
Christine Franks
c8ae9d5a60 Merge "Allow ogg files to be selected as ringtones" into oc-dev
am: d44afb99c8

Change-Id: Ia99142562cd97ad5aeec2dfa40a63d80657a2c0d
2017-05-10 16:04:45 +00:00
Jean-Michel Trivi
f86d68d447 Merge changes from topic 'mediaplayer_gc' into oc-dev
* changes:
  IAppOpsCallback has weak reference to PlayerBase
  IPlayer has weak reference to PlayerBase
2017-05-10 15:31:02 +00:00
Christine Franks
d44afb99c8 Merge "Allow ogg files to be selected as ringtones" into oc-dev 2017-05-10 15:03:28 +00:00
Christine Franks
8fbedbbf19 Allow ogg files to be selected as ringtones
Bug: 37891455
Test: manual - open custom phone ringtone picker in settings, navigate
to an .ogg file, and it should be selectable; select it and it should
add itself to the list of available ringtones, and play its sample
correctly.

Change-Id: I33b1ff07d0b43646c807ba0994efa4f6d8d95cae
2017-05-09 18:27:21 -07:00
Santos Cordon
ee8931e258 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds:
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
2017-05-09 18:17:39 -07:00
Jean-Michel Trivi
aee6ee9467 IAppOpsCallback has weak reference to PlayerBase
The implementation of the IAppOpsCallback interface was an inner class
  that implicitly held a strong reference to the PlayerBase
  instance, preventing subclasses of PlayerBase to be GC'd.
The fix consists in making the IAppOpsCallback implementation be a static
  class and hold a weak reference to PlayerBase.

Test: see bug
Bug: 35359144

Change-Id: Ic97d07dad0be2376eef160d01ff4e4a9e5ee0bcd
2017-05-09 16:19:36 -07:00
Jean-Michel Trivi
cf1b224a78 IPlayer has weak reference to PlayerBase
The implementation of the IPlayer interface was an inner class
  that implicitly held a strong reference to the PlayerBase
  instance, preventing subclasses of PlayerBase to be GC'd.
The fix consists in making the IPlayer implementation be a static
  class and hold a weak reference to PlayerBase.

Test: see bug
Bug: 35359144
Change-Id: I5f7d658f4bda07c92cfdb437b42d3f78213ab552
2017-05-09 11:19:42 -07:00
TreeHugger Robot
46edacff6c Merge "Add getData() member to SoundTriggerDetector.EventPayload." 2017-05-09 00:41:32 +00:00
Dongwon Kang
dfb02762a2 Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev am: 7a5024e048
am: 37bb98b7a3

Change-Id: I98993c70206ccbd4834bebd624bedad2582bcf70
2017-05-09 00:19:33 +00:00
Dongwon Kang
37bb98b7a3 Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev
am: 7a5024e048

Change-Id: I00dfa3af1b542d6e388b2f226526abb674f82a3e
2017-05-09 00:08:25 +00:00
Dongwon Kang
7a5024e048 Merge "TIF: allow time also in COLUMN_RELEASE_DATE" into oc-dev 2017-05-08 23:56:11 +00:00
Dongwon Kang
6639f681fb Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev am: 05e63bf5fa
am: 67c1e3b1a6

Change-Id: Ie9ccc41f6a0730b001da6a7774e241e4d9fb7df2
2017-05-08 22:38:17 +00:00
Dongwon Kang
67c1e3b1a6 Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev
am: 05e63bf5fa

Change-Id: If989da1a118d28c85d127c541a6bdbe4b35d9ac2
2017-05-08 21:59:35 +00:00
Dongwon Kang
05e63bf5fa Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev 2017-05-08 21:37:01 +00:00
Colin Cross
0ece443558 Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.

Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit c8ed45d38f3b42e06c9e0980e133a84181752b5e)
2017-05-05 20:03:42 +00:00
Colin Cross
28f320c5be Merge "Update path for libmediandk headers" 2017-05-05 20:02:14 +00:00
Eino-Ville Talvala
2e385f76f8 Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am: 97258cd731" into oc-dev-plus-aosp
am: 74d76f406b

Change-Id: I0ace22eb4cb7e4c90baf3ff066a400e609f5e620
2017-05-05 16:37:28 +00:00
Eino-Ville Talvala
97258cd731 Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev 2017-05-05 16:06:08 +00:00
Colin Cross
c8ed45d38f Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.

Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
2017-05-04 17:58:11 -07:00
Eino-Ville Talvala
07ad459c84 ImageWriter: Attach non-opaque Images as well.
With all the work under the hood of ImageReader/Writer in the last few
releases, this is much more straightforward to enable.

Only trick is to ensure that the Image detached from the ImageReader
correctly clears out its planes, if present.

Bug: 19962027
Test: Camera CTS still passes on angler, sailfish, ryu
Change-Id: Ic8a1f3e2f45cf15971d76e308a5af25eb2fd66f1
2017-05-04 11:04:56 -07:00
Chris Thornton
7554ff0e84 Add getData() member to SoundTriggerDetector.EventPayload.
If the HAL populates the recognition event with data that isn't trigger
audio, it's currently impossible for clients to actually read that
opaque data. By adding this getter, clients who understand how the
detection engine works can react to whatever is in the data blob.

Test: Modify SoundTriggerTestApp to verify that the data is accessible.
Change-Id: I8a9feccab98e2d15653dd55f28a43095f8ee1e44
2017-05-03 17:49:39 -07:00
Jean-Michel Trivi
c903a8894a Merge "Message about audio stream deprecation as warning" into oc-dev am: dd8a71f4a9
am: 86af1cd18f

Change-Id: I8c3627d5756661115c66228187c2b0685a7145f3
2017-05-02 19:42:15 +00:00
TreeHugger Robot
ae6cf17a9a Merge "Make IMidiDeviceServer.setDeviceInfo method oneway" 2017-05-02 17:41:54 +00:00
Jean-Michel Trivi
c4c13b44b8 Message about audio stream deprecation as warning
The message indicating the use of stream types for operations
  other than volume control is deprecated shouldn't be an
  error but a warning

Test: use apps that request audio focus with a stream type, check log
Bug: 37887058
Change-Id: Iaafae8aa599984688dae448e868de81317add4d3
2017-05-02 10:01:08 -07:00
Chulwoo Lee
3457567178 Merge "Allow null setup activity for TV input" into oc-dev am: 90074d1ec8
am: 6af43e5d6f

Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15
2017-05-02 07:08:41 +00:00
TreeHugger Robot
90074d1ec8 Merge "Allow null setup activity for TV input" into oc-dev 2017-05-02 06:56:52 +00:00
Conrad Chen
2a85907926 Merge "TIF: change documentation wording for onSetSurface()" into oc-dev am: 12c6a04db0
am: 526b3914ba

Change-Id: I00cdec5ab86ed4d811931e552188dc809fdae351
2017-05-02 03:40:54 +00:00
TreeHugger Robot
12c6a04db0 Merge "TIF: change documentation wording for onSetSurface()" into oc-dev 2017-05-02 03:26:32 +00:00
Mikhail Naganov
b414a2ccf1 Make IMidiDeviceServer.setDeviceInfo method oneway
This method is called from MidiService in system server, must be
oneway.

Remove the call to IMidiDeviceServer.getDeviceInfo from
MidiService. It seems to be redundant. The reason is that
MidiDeviceInfo is only created by MidiService (to maintain
unique IDs), and after creation, it is pushed both to a remote
MidiDeviceServer, and to a local MidiService.Device class
simultaneously inside addDeviceLocked method. Thus, if
MidiService.Device.mDeviceInfo is still null, there is no chance
that remote MidiDeviceServer can hold a non-null
MidiDeviceInfo. So the call to IMidiDeviceServer.getDeviceInfo
will also return null, and thus can be avoided.

Note that only for BT MIDI devices can MidiService.Device receive
MidiDeviceInfo later in the lifecycle. All other types of devices
receive MidiDeviceInfo upon construction.

Bug: 37535382
Test: Used BT MIDI keyboard with MidiSynthDemo app
Change-Id: I5378207922187866f3c43e01f1ed30f042720167
2017-05-01 16:46:50 -07:00
Chulwoo Lee
75ffc5f309 Allow null setup activity for TV input
Test: cts-tradefed run cts -m CtsTvTestCases -t android.media.tv.cts.TvInputInfoTest
Bug: 37863603
Change-Id: I62f9927f94534c0564a3c52f8c7b266a347399e1
2017-05-01 14:10:25 -07:00
Conrad Chen
a9b6289faa TIF: change documentation wording for onSetSurface()
Test: documentaion fix
Bug: 31494507
Change-Id: Ib25d45fb3c7e973aa09a5f91ced11abefea4c5ba
2017-05-01 13:18:51 -07:00
Jean-Michel Trivi
21785d6385 Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev am: a08ba3ef31
am: 43c34ae003

Change-Id: If55c6cc4e9130359207a33cc006820313df8db96
2017-05-01 20:09:41 +00:00
Jean-Michel Trivi
36728ce14f Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest
When translating a focus request from the N- API to AudioFocusRequest,
  do not do null checks for listener or handler, those are only
  for the AudioFocusRequest.Builder.

Test: use app built for N- and request focus, no crash
Bug 37855238

Change-Id: I675b3144e913ab674fe27f9f65ee7a7bea24a72c
2017-05-01 12:33:40 -07:00