Commit Graph

7809 Commits

Author SHA1 Message Date
TreeHugger Robot
95902c563b Merge "CamcorderProfiles: Add new camcorder profiles" 2019-02-04 22:10:52 +00:00
Eric Laurent
c511faec51 audio: fix AudioRecordingConfiguration.equals()
Use Arrays.equals() instead of equals() methods on the effects
Arrays contained in AudioRecordingConfiguration.

Bug: 123702064
Test: cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.AudioRecordingConfigurationTest
Change-Id: I11d1321f1a5d8f50c248a4702bbba6a309280b5a
2019-02-04 12:34:53 -08:00
Chong Zhang
bb609f8319 Expose a few keys that's already used by apps
bug: 80314065
Change-Id: Ia9369decb8c454fe091fca77f8996e1400c14790
2019-02-04 11:14:07 -08:00
Henry Fang
5215ac9d41 Revert "Revert "Add public API to use new interfaces from cas@1.1""
This reverts commit cdcaed6acb.

Reason for revert: <Verified build locally, CL is fine. original issue may be caused by conflict between merges>

Change-Id: Id9707692a704c3d4475aee1f6c580208eb6ab744
Test: Manual
Bug: 122472761
2019-02-04 10:57:38 -08:00
Hyundo Moon
ff36c48229 Revert "Remove MediaController2 usages in MediaSessionServiceImpl"
This reverts commit c1e4316e02.

Reason for revert: Now the circular dependency problem is resolved, this change is now obsolete.

Bug: 123336670
Change-Id: I065d811e9b8a3c7f851fb66d9527d62b417f1420
2019-02-01 14:54:24 +09:00
Dongwon Kang
610e0670a1 Merge changes from topic "media2-stub"
* changes:
  Move Session2Token to media apex
  Add updatable_media_stubs to prevent private API use.
2019-02-01 04:49:14 +00:00
Andy Hung
dd45d82911 Merge "Add master audio balance" 2019-02-01 01:53:28 +00:00
Dongwon Kang
e6e5f41302 Move Session2Token to media apex
Test: build
Change-Id: Id55fe0fa8596f98a84f5bdc89755631b18c7d308
2019-01-31 15:33:41 -08:00
Edward Savage-Jones
35c292f57a Add master audio balance
Test: Change Balance through Settings, play audio
Bug: 28390736
Change-Id: I6cebd3fa448239999c5d624f10902152d0db679b
2019-01-31 15:30:42 -08:00
TreeHugger Robot
5f70acf095 Merge "Resolve feedback from API review" 2019-01-31 21:21:04 +00:00
Praveen Chavan
8f94d12b85 CamcorderProfiles: Add new camcorder profiles
add VGA. QHD, 4K-DCI profiles

Bug:122944520
Test: run cts -m CtsMediaTestCases -t android.media.cts.CamcorderProfileTest --skip-preconditions
 run cts -m CtsMediaTestCases -t android.media.cts.CameraProfileTest --skip-preconditions

Change-Id: I1067da3769635365048529fe315e6971c2d51696
2019-01-31 11:28:28 -08:00
Jeff Tinker
8de43ee121 Resolve feedback from API review
Fix inconsistent naming of offline license states

bug:120489407
bug:120488811
test:cts and gts media tests

Change-Id: I6cceac233cf8882c5bf7fbef7503764c611125d1
2019-01-31 00:48:20 -08:00
Sungsoo Lim
89f6f4ed0b Revert VolumeProvider API changes
Bug: 119539695
Test: build
Change-Id: I57e204bb25501448e3bdf67e59c8e5b696d5b191
2019-01-31 15:35:48 +09:00
Insun Kang
504e3eb27a Revert changes for moving MediaSessionService into AML
Bug: 123000882
Test: n/a
Change-Id: I3d3bffa27916ccbe45bfa32517a4d06e043b9bbb
2019-01-31 15:32:04 +09:00
Sungsoo Lim
e6f9bdeb42 Revert Media 1.0 API changes for mainline module
Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest, and
      MediaSessionManagerTest
Change-Id: I2453dfcd3852c77a825b5ed5db197591303a6115
2019-01-31 11:28:09 +09:00
Xusong Wang
72492e27b6 Merge "Revert "Add public API to use new interfaces from cas@1.1"" 2019-01-31 01:00:57 +00:00
Henry Fang
cdcaed6acb Revert "Add public API to use new interfaces from cas@1.1"
This reverts commit 818719dd45.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I595c1949ed139700144f19ee5bd7f91a5f0a1edd
2019-01-31 00:46:05 +00:00
Hyundo Moon
88dd29a6a3 Merge changes Ie30f0ca8,I59b4d4ce
* changes:
  Move Media 1.0 files in mainline back to framework
  Remove MediaSessionEngine.CallbackStub
2019-01-31 00:35:30 +00:00
TreeHugger Robot
7d84a0bd97 Merge "MediaCodec: change exception type" 2019-01-30 23:49:46 +00:00
Henry Fang
d3f4b874b1 Merge "Add public API to use new interfaces from cas@1.1" 2019-01-30 22:53:50 +00:00
Mikhail Naganov
a730a5ebb3 MediaCodec: change exception type
As suggested in API review, change IllegalArgumentException
to NullPointerException for the case when the argument is null.

Bug: 123569725
Test: make
Change-Id: I4f0d6fd609b1c2f2096fe0f610804f49432cb650
2019-01-30 12:32:42 -08:00
Hyundo Moon
83ff14c310 Move Media 1.0 files in mainline back to framework
Test: make update-api -j; make -j;
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: Ie30f0ca86bd9303683bf6573f2f5858c6fb3206a
2019-01-30 22:03:04 +09:00
Hyundo Moon
2a5179df15 Remove MediaSessionEngine.CallbackStub
This CL also removes SessionCallbackLink.CallbackStub class
from the system API list.

Bug: 123500993
Test: make update-api -j; make -j;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I59b4d4ce058c53c82d816152039c51b109f0c245
2019-01-30 19:43:57 +09:00
Sungsoo Lim
15c52f693d Move Rating and MediaDescription into mainline module
Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest and
      MediaSessionManagerTest
Change-Id: I2274a473700b6ea432e368aeeb5201d449d53635
2019-01-30 13:58:31 +09:00
TreeHugger Robot
1444690e53 Merge changes I1d901692,I3e0bca75
* changes:
  ControllerLink: Remove unused parameter asSystemService
  MediaController: Remove dispatching key event as system service APIs
2019-01-30 01:53:50 +00:00
TreeHugger Robot
d070768d8d Merge "Move MediaMetadata class back to framework" 2019-01-30 01:04:04 +00:00
Jaewan Kim
8be71c0fe2 MediaController: Remove dispatching key event as system service APIs
This removes hidden API usages from the fwk to apex, which would be
prohibited.

With this API, the dispatching logic is changed as follows for sending
key events directly to MediaSessionRecord through MediaSessionService.

Before:
    PhoneWindow
    -> MediaController.dispatch***AsSystemService(key)
    -> MediaSessionRecord

After:
    PhoneWindow
    -> MediaSessionManager.dispatch**AsSystemService(sessionToken, key)
    -> MediaSessionService
    -> MediaSessionRecord

Bug: 123485698
Test: Build, flash and injected some key events
Change-Id: I3e0bca7565ae2f142c3389322d867700646d5038
2019-01-29 21:21:17 +09:00
Hyundo Moon
a17bf2d0f2 Move MediaMetadata class back to framework
Due to the @UnsupportedAppUsage on
MediaMetadata.getKeyFromMetadataEditorKey, we'd better not to move the
class to APEX. This CL moves the MediaMetadata back to framework.

Also, in order to avoid hidden framework API usages in mainline module,
this CL moves the usage of hidden constructor of MediaMetadata.Builder()
from MediaSessionEngine to MediaSession.

Bug: 123488217
Test: make update-api -j; make -j;
      vendor/google/tools/flashall;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I21b4f0f59214478071bb0eafa93bb9538e44bf4e
2019-01-29 17:16:50 +09:00
Jaewan Kim
d0bb9eab0d Merge changes Ib3c350ba,I9f6b17a6
* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages
2019-01-29 07:38:46 +00:00
Hyundo Moon
99cd4d4739 Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()" 2019-01-29 06:53:35 +00:00
Jaewan Kim
36a0ff35fb MediaRouter: Remove hidden annotation usages
This removes hidden annotation usages from the framework to the apex,
which would be prohibited.

Test: Build
Bug: 123485698
Change-Id: I9f6b17a61c5438e0d538a7a97587c375d8603613
2019-01-29 15:31:13 +09:00
Hyundo Moon
2e4e51b365 Remove unused MediaSession.notifyRemoteVolumeChanged()
Bug: 123499849
Test: make -j;
Change-Id: Ie629b0811e07444cf277c9552aaece558e1c1f41
2019-01-29 13:50:46 +09:00
Sudheer Shanka
ca923a9aab Merge "Update DownloadStorageProvider to include MediaStore.Downloads." 2019-01-29 02:57:44 +00:00
TreeHugger Robot
e82f0371a5 Merge changes I6bda318c,Ie4d259dc
* changes:
  MediaController: Remove unused constructors
  Make ISessionManager.getSessions() return list of tokens
2019-01-29 02:31:23 +00:00
Jin Seok Park
3b8e00f138 Merge "MetadataRetriever: Unhide Exif-related constants" 2019-01-29 00:49:37 +00:00
Henry Fang
818719dd45 Add public API to use new interfaces from cas@1.1
Add sendSessionEvent and onSessionEvent to Java API
Test: manual
Bug: 122472761

Change-Id: If3078584202fa5a57a4b787ef09a33fb09625850
2019-01-28 16:47:09 -08:00
TreeHugger Robot
5e55e809a7 Merge "Camera: Add support for dynamic depth image format" 2019-01-28 22:21:46 +00:00
John Reck
e98248eb05 Merge "Fix ImageReader#newInstace with usage" 2019-01-28 20:17:25 +00:00
TreeHugger Robot
ad0db6fcda Merge "Add a constant for ISDB_S3" 2019-01-28 19:17:09 +00:00
Hyundo Moon
817f5f859a Make ISessionManager.getSessions() return list of tokens
This CL changes the return type of ISessionManager.getSessions()
from List<ControllerLink> to List<MediaSession.Token>.

Bug: 123488663
Test: Ran below tests
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
Change-Id: Ie4d259dc3691977451c7751ae06816d67079a3f4
2019-01-29 02:36:24 +09:00
Sudheer Shanka
e93db5123b Update DownloadStorageProvider to include MediaStore.Downloads.
Bug: 120879205
Test: manual
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I44be836899437d87fc1a00e5fe316c6b68488643
2019-01-28 08:20:47 -08:00
Jean-Michel Trivi
170725ab67 Merge "AudioTrack API for delay/padding in offload" 2019-01-28 15:26:45 +00:00
Jin Seok Park
245cb132c4 MetadataRetriever: Unhide Exif-related constants
In order to support reading HEIF format images in AndroidX
ExifInterface, we need to unhide the Exif-related constants
inside MediaMetadataRetriever.

Bug: 123493429
Test: update-api
Change-Id: I8b9c1709d9fb00f7ad2d7815d4c280678408ea03
2019-01-28 16:17:50 +09:00
Jeff Sharkey
cb269aac7e Get CtsProviderTestCases building against API.
To help confirm that we're actually testing developer-visible
behaviors, we need to build against public APIs, since there have
been plenty of examples in this suite of "testing" hidden API
behaviors, which are then misleading to developers.

Bug: 120429729
Test: atest cts/tests/tests/provider/
Exempt-From-Owner-Approval: Trivial API annotations
Change-Id: I07fe33e54f611a6060217f0706fb99b809961f4d
2019-01-27 03:03:39 +00:00
Jean-Michel Trivi
157cba493c AudioTrack API for delay/padding in offload
Add API to add support for specifying delay and padding values
  for the current compressed stream.
Add API to indicate the end of stream after a write() operation

Bug: 122825812
Test: atest AudioTrackOffloadTest
Change-Id: Ib4dc76938fb5cea77ce67aa12aca7d38f66e756c
2019-01-25 19:11:06 -08:00
John Reck
4d312b212c Fix ImageReader#newInstace with usage
Need to actually respect the given usage or the API doesn't
work. Shift the default to be done Java-side where it's clear
if usage was user-provided or not. Remove the incorrect
validations and assertions around usages.

Add missing HardwareBuffer#isSupported to let users
check if a usage & format combination is supported.

Change-Id: I70bfe6e6c41e78425a38af6b17d421f0e80e818b
Fixes: 123423319
Test: HardwareBuffer CTS tests
2019-01-25 16:03:58 -08:00
Jean-Michel Trivi
103a678ac3 Merge "AudioDeviceBroker in audio service" 2019-01-25 22:31:09 +00:00
Jean-Michel Trivi
5885037c88 AudioDeviceBroker in audio service
New AudioDeviceBroker class running in audio service.
Has dedicated message loop for handling audio device
   connections and disconnections.
New helper classes for AudioDeviceBroker:
 - BtHelper for Bluetooth
 - AudioDeviceInventory to manage list of devices

Bug: 112863932
Test: media CTS + audio CTS Verifier
Change-Id: I3e8f662a9d82fa7245695888e14fac7f4fc6e728
2019-01-25 11:03:50 -08:00
Hyundo Moon
c1e4316e02 Remove MediaController2 usages in MediaSessionServiceImpl
Bug: 123336670
Test: Passed below tests
      MediaSessionManagerTest#testNotifySession2Created/Destroyed*
Change-Id: I25a20bf9e8a78920f2219d22b81b899af665ed32
2019-01-25 18:52:44 +09:00
Kristian Monsen
71fe12bb84 Add a constant for ISDB_S3
Test: No test, just adding a constant and building
Bug: 122371669
Change-Id: Icbf10d2ddfb0fe05df9b3aedf3f17b8687404479
2019-01-24 17:09:18 +01:00