Commit Graph

6874 Commits

Author SHA1 Message Date
Marco Nelissen
69b6a382a3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
2017-06-06 23:33:50 +00:00
Marco Nelissen
e18e8c4113 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
2017-06-06 23:28:27 +00:00
Marco Nelissen
3272cf26c1 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
2017-06-06 23:22:14 +00:00
Marco Nelissen
6d5bc9a3c2 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
2017-06-06 23:16:24 +00:00
Marco Nelissen
5181a7ab64 Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
2017-06-06 23:02:35 +00:00
Jeff Sharkey
ec68b46bc8 Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
2017-06-06 15:48:24 +00:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
Marco Nelissen
46132afee7 Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug: 38391487
Bug: 22771132
Test: build, run CTS, stream music

Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
2017-06-02 22:35:35 +00:00
Wei Jia
55d7e9e19a Merge "MediaCodec: add CSD description for FLAC" 2017-06-02 16:16:42 +00:00
Dongwon Kang
86dd9f3d70 Merge "Update documentation of MediaCodec regarding partial frame." into oc-dev am: 878fc6a81c
am: 1948af7bd0

Change-Id: I9970625b727502eb85a888eab0867e9b583abda1
2017-06-01 09:17:29 +00:00
Dongwon Kang
1948af7bd0 Merge "Update documentation of MediaCodec regarding partial frame." into oc-dev
am: 878fc6a81c

Change-Id: I2548802b594a2b4710c5661ffecf26dcdacdf1d7
2017-06-01 09:10:15 +00:00
TreeHugger Robot
1c70b0e42d Merge "MediaRouter: Remove the globally selected route feature" 2017-06-01 09:07:44 +00:00
Conrad Chen
f98a4f2a60 TIF: add TvContract.isRecordedProgramUri() method
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 37577698
Change-Id: I91bfae8db1c3fa2e50313b0501423aefae37366f
2017-05-31 17:32:00 -07:00
Dongwon Kang
9464db6e5f Update documentation of MediaCodec regarding partial frame.
Test: documentation update
Bug: 62202844
Change-Id: Ie1e269e7e22206001a145e9c7ee6f92d7e8633e1
2017-05-31 16:37:13 -07:00
Jean-Michel Trivi
64d1977ad1 Merge "Playback activity monitoring: add player types" into oc-dev am: faa2cdfa47
am: a4f967471b

Change-Id: I598ed9f0ab7f17944b3eea3107bf058a1a99f917
2017-05-26 18:19:08 +00:00
Jean-Michel Trivi
a4f967471b Merge "Playback activity monitoring: add player types" into oc-dev
am: faa2cdfa47

Change-Id: Ic22415e166e94e9a1d3301557b8fe36afce9d29f
2017-05-26 18:13:38 +00:00
Jean-Michel Trivi
0b7649a26b Playback activity monitoring: add player types
Add player types for playback activity monitoring:
 - AAudio
 - hardware sources
 - proxy for external players
Fix some declarations that do not follow coding guidelines

Test: n/a
Bug: 62027849
Change-Id: I14088a071a296fa8d342b36b550f1dc4e3388653
2017-05-25 19:53:35 -07:00
Sungsoo
d103e56e65 MediaRouter: Remove the globally selected route feature
Bug: 23887911, Bug: 32958908
Test: Manual and passed MediaRouterTest
Change-Id: I0106cf1054d2117a2e86f99087cd8bda0eac020c
2017-05-25 11:33:13 +09:00
Wei Jia
cb21157c1a MediaCodec: add CSD description for FLAC
Test: developer page shows correct content
Bug: 37787245
Bug: 37794552
Change-Id: I955dc3bf730f91653b2622aa0b2e7f1c1c867a72
2017-05-24 15:50:12 -07:00
TreeHugger Robot
936f1044bb Merge "MediaPlayer: fix typo in stop() documentation" 2017-05-22 21:54:28 +00:00
Kevin Rocard
ec5305f8f9 MediaPlayer: fix typo in stop() documentation
Test: compile
Bug:

Change-Id: I6fd2cdcadcf22f61b0543d2844a87b9e5ef74c9e
Signed-off-by: Kevin Rocard <krocard@google.com>
2017-05-18 18:39:19 +00:00
Andy Hung
0dc609a113 Merge "VolumeShaper: Enable xOffset from Java" into oc-dev am: b33c0eb07a
am: 0cc01b5bc2

Change-Id: I9afcd844391b56991b5cc686808f89b4ec878a31
2017-05-18 16:34:39 +00:00
Andy Hung
0cc01b5bc2 Merge "VolumeShaper: Enable xOffset from Java" into oc-dev
am: b33c0eb07a

Change-Id: Icc37873492d612a66484d731168de5c5e27213c9
2017-05-18 16:26:41 +00:00
Andy Hung
b33c0eb07a Merge "VolumeShaper: Enable xOffset from Java" into oc-dev 2017-05-18 16:15:50 +00:00
Andy Hung
3c0f5d296e VolumeShaper: Enable xOffset from Java
Previously only accessible from native.
Also improve documentation and comments.

Test: CTS VolumeShaperTest, Ducking
Bug: 38353147
Change-Id: I27bb34f0a5d28f80d138111bbeeb92653b5195c5
2017-05-17 18:31:38 -07:00
Jean-Michel Trivi
9bc3840b19 Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev am: 1daffb7aac
am: 75b7449b56

Change-Id: I376259e8a0befd910429cbcc00e93cf04be0d225
2017-05-17 23:20:16 +00:00
Jean-Michel Trivi
75b7449b56 Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev
am: 1daffb7aac

Change-Id: I673355773a045c40f72d9b3a8d93ae667f739491
2017-05-17 23:03:57 +00:00
Jean-Michel Trivi
1daffb7aac Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev 2017-05-17 22:51:41 +00:00
TreeHugger Robot
c450b1bf55 Merge "Fix incorrect documentation on TvContract.buildProgramsUriForChannel()" 2017-05-17 22:18:27 +00:00
Dongwon Kang
0e65f5dbf5 Fix incorrect documentation on TvContract.buildProgramsUriForChannel()
Test: documentation fix
Bug: 36791800
Change-Id: I601c72a0f65d53201aadad48c0c368b46431c895
2017-05-17 17:58:49 +00:00
Dongwon Kang
7fc65c23ff Fix the documentation of onTimeShiftGetCurrentPosition()
Test: documentation fix
Bug: 30254671
Change-Id: If6cb73f6824b9bc6db9aa6eed71319458662be17
2017-05-17 16:12:25 +00:00
Colin Cross
eb27d2798a Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d)
2017-05-17 03:02:21 +00:00
Colin Cross
14b2beb0ef Merge "Convert libmedia_jni to Android.bp" 2017-05-17 02:42:41 +00:00
Jean-Michel Trivi
cfcb43121d AudioFocusRequest: longer code sample, javadoc fixes
Test: make -j offline-sdk-docs
Bug: 38124458
Change-Id: I18e83175f6919fd6afeae9475c00eded829cb96a
2017-05-16 16:15:47 -07:00
Colin Cross
76de4f6b4d Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
2017-05-16 13:07:57 -07:00
Sungsoo
b64a28ea80 Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev am: 69c81d8cef
am: 15cbcc866b

Change-Id: I3b75ab0c160f63d4a77d36bcd27b03c4014fbd90
2017-05-16 06:46:12 +00:00
Sungsoo
6e28b97525 MediaBrowser: Allow to connect while disconnecting
Bug: 37241378
Test: manual, passed MediaBrowserTest and MediaBrowserServiceTest
Change-Id: I8428c4fcb9855f1a4d898419d7f1bb09495eb8d9
2017-05-15 15:51:39 +09: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
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
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
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
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