Commit Graph

5789 Commits

Author SHA1 Message Date
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
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
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
1daffb7aac Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev 2017-05-17 22:51: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
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
Mathias Agopian
910ab13e66 Plumb gralloc producer/consumer bits correctly
Bug: 33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
2017-04-28 00:13:29 +00:00
Conrad Chen
a16d465a18 Merge "TIF: fix javadoc of recorded programs" into oc-dev 2017-04-26 21:48:01 +00:00
Dongwon Kang
e1a795379d Merge "TIF: fix documentation in TvContract" into oc-dev 2017-04-26 16:22:13 +00:00
Jean-Michel Trivi
c4a169cfb4 Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev 2017-04-26 15:27:04 +00:00
TreeHugger Robot
a35e4e5584 Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev 2017-04-26 00:27:57 +00:00
Jean-Michel Trivi
461922fcfc Audio focus enforcement: duck automatically apps for SDK O+
Enforce automatic ducking only for apps written for an SDK target
  level above 25 (N-MR1)

Test: play notification while Podcast Addict is playing, verify it pauses instead of being ducked
Bug: 37506138
Change-Id: Id7e01a92a51308bd7a3f24abc417d2434b532c12
2017-04-25 15:23:17 -07:00
Jeff Sharkey
a00c7c0a99 Merge "Fix some issues found by new doclava linter." into oc-dev 2017-04-25 22:11:01 +00:00
Jeff Sharkey
0f3f60b576 Fix some issues found by new doclava linter.
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Jean-Michel Trivi
44515357ce Merge "VolumeShaper: API change for duration" into oc-dev 2017-04-25 15:36:38 +00:00
Dongwon Kang
0dfc8e46ff TIF: fix documentation in TvContract
This fixes wrong documentation on the following fields:
PreviewPrograms|WatchNextPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS
PreviewPrograms|WatchNextPrograms.COLUMN_DURATION_MILLIS

Test: build
Bug: 37624075
Change-Id: Iad98ebeac713a034bbca9a31113c0da9bbd39832
2017-04-24 16:17:52 -07:00
Jean-Michel Trivi
4c86efa1e3 VolumeShaper: API change for duration
Time in milliseconds is a long.
Update API to not specify the unit in the setter/getter for
  the VolumeShaper duration.

Test: cts-tradefed run cts CtsMediaTestCases -t android.media.cts.VolumeShaperTest

Change-Id: If5f95cc43418d831105cbef2c43b6e9cfcf9082b
2017-04-24 22:58:22 +00:00
Conrad Chen
cc91454f8c TIF: fix javadoc of recorded programs
Removes descriptions about required field of recorded programs' channel
ID.

Test: javadoc fix
Bug: 37625301
Change-Id: I0ae5eb6e5419883455044676b23e013392cc3e61
2017-04-24 12:08:56 -07:00
TreeHugger Robot
62a3aa745a Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev 2017-04-21 21:10:51 +00:00
Wei Jia
bebeaf9ae3 MediaPlayer: fix new API seekTo to address API review.
Test: compiles
Bug: 36790516
Bug: 37514763
Change-Id: I91307d10e6c9bc65779651c056053b3a025b0d50
2017-04-21 11:05:13 -07:00
Dongwon Kang
a98fd56bff TIF: remove c-tor for WatchNextProgram
Test: build
Bug: 37514616
Change-Id: I61ea5182cbfec6bbd260c2b3b08b5f456e0558d4
2017-04-21 10:14:04 -07:00
Hassan Shojania
652d006d6b Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev 2017-04-21 02:58:25 +00:00
TreeHugger Robot
0e6cce9de1 Merge "media: Change setNextOutputFile to address API review comments." into oc-dev 2017-04-21 02:06:18 +00:00
Hangyu Kuang
c481c50a42 media: Change setNextOutputFile to address API review comments.
Bug: 37514763
Test: CTS test
Change-Id: If0fb59f26ecf3882600ca7a8b26b6c248615bbd0
2017-04-20 13:53:48 -07:00
Conrad Chen
047adbefe2 Merge "Fix overlay view not updated during scaling TvView" into oc-dev 2017-04-20 18:08:12 +00:00