Commit Graph

5839 Commits

Author SHA1 Message Date
Marco Nelissen
031a20a6c7 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c
am: 2c1d4f8f7b

Change-Id: I90250994c72bd9cc54ebb87df3f0f7f510417ef1
2017-06-07 00:24:23 +00:00
Marco Nelissen
2c1d4f8f7b Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8
am: 9e4e6c4b7c

Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
2017-06-07 00:16:34 +00:00
Marco Nelissen
db9d2588b8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3
am: d7fe3ea6a8

Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
2017-06-07 00:04:12 +00:00
Marco Nelissen
d7fe3ea6a8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887
am: 4d9e6150f3

Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
2017-06-06 23:54:55 +00:00
Marco Nelissen
4d9e6150f3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3
am: ce5c72e887

Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
2017-06-06 23:45:51 +00:00
Marco Nelissen
ce5c72e887 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113
am: 69b6a382a3

Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
2017-06-06 23:39:57 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
05e63bf5fa Merge "TIF: specify that selection is not allowed in CONTENT_URI" into oc-dev 2017-05-08 21:37:01 +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
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
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
TreeHugger Robot
90074d1ec8 Merge "Allow null setup activity for TV input" into oc-dev 2017-05-02 06:56:52 +00:00
TreeHugger Robot
12c6a04db0 Merge "TIF: change documentation wording for onSetSurface()" into oc-dev 2017-05-02 03:26:32 +00: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
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
TreeHugger Robot
f3a5f66139 Merge "Add parameter for accessing channels from 3rd-party TV apps." into oc-dev 2017-05-01 18:20:13 +00:00
Jean-Michel Trivi
97de334ff1 AudioFocusRequest: more docs, listener without handler
Focus listener: follow platform pattern for setter of listener
  and handler (set(listener) and set(listener, handler) methods).
More docs.

Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioFocusTest
Bug: 30258418

Change-Id: Ib5d1fbc3cf92821b63ffc1b4ad4cf4384bb6ff54
2017-04-30 18:55:03 -07:00
jiabin
2ee60cefcc Add parameter for accessing channels from 3rd-party TV apps.
Test: runtest --path packages/providers/TvProvider/tests
Bug: 37576643
Change-Id: Iff797d4cdc9e0a4115d44c4de732f241a9a9f878
2017-04-28 18:20:10 -07:00
Dongwon Kang
bf9d5e64a6 TIF: allow time also in COLUMN_RELEASE_DATE
Test: build
Bug: 37648162
Change-Id: Ided8e8592f8f2722b9fd47b98c2925ac33e51130
2017-04-28 13:46:57 -07:00
Dongwon Kang
c51b95471c TIF: specify that selection is not allowed in CONTENT_URI
Test: build
Bug: 36788441
Change-Id: Iddca6d6d2083aa0e6d12d896787c0a91d200c56d
2017-04-28 10:10:28 -07:00