Commit Graph

8860 Commits

Author SHA1 Message Date
Santiago Seifert
bf66af7275 Merge "Support psshs with matching UUID in DrmInitData" 2020-02-18 15:10:04 +00:00
Santiago Seifert
5bb4b20de6 Support psshs with matching UUID in DrmInitData
Also prevent unnecessary allocation in a
MediaExtractor DrmInitData implementation.

Bug: 132153067
Test: Draft CL.
Change-Id: If7d50a9f3fec22035b6db41338a2d5e9e7e839db
2020-02-18 11:42:43 +00:00
Kyunglyul Hyun
d5daf35181 Document more about volume provider ID.
Document more about what getVolumeControlId returns.

This CL is to address API Review issue.

Bug: 148403124
Test: N/A
Change-Id: I382cbe3efe2fd5732f50493bc6d243ae54c5a257
2020-02-18 17:49:54 +09:00
Kyunglyul Hyun
96e4893dbe Merge "MediaRouter2: Clean up APIs" 2020-02-18 02:18:14 +00:00
Hyundo Moon
ea99a6640d Merge "MediaRouter2: Refactor internal classes" 2020-02-18 02:02:09 +00:00
shubang
c090b6db71 Tuner Java API: minor changes per API review feedback
The feedback is b/149341923

Bug: 149341923
Test: make;
Change-Id: I54f98b2531c73f341ff49d29878e6e30d9d4b105
2020-02-17 16:29:45 -08:00
Nick Chalko
90a13aa688 Merge "Add encoding information to TvTrackInfo" 2020-02-17 19:29:32 +00:00
Ivan Chiang
f5dd8c7faa Merge "Fix isDocumentMimeType issue in MediaFile" 2020-02-17 12:34:08 +00:00
Hyundo Moon
56337496f9 MediaRouter2: Refactor internal classes
This CL introduces following changes:
 - Remove ambiguous 'client' word usages
 - Clarify AIDL file names and related classes/methods/fields
 - Reorder AIDL methods

Bug: 149642195
Test: CTS and atest mediaroutertest
Change-Id: I53656c3be52ab8deb3fbf96bf7caf9a3476d7af6
2020-02-17 21:18:19 +09:00
Santiago Seifert
c3e3933770 Merge "Add KEY_CAPTION_SERVICE_NUMBER to MediaFormat" 2020-02-17 10:45:30 +00:00
Kyunglyul Hyun
3729e9f910 MediaRouter2: Clean up APIs
Rename APIS related to RoutingController.
Specifically,
- requestCreateController is changed to transferTo, which is the only
way to "transfer" that may or may not create a controller.
- ControllerCallback is split into TransferCallback and
(new) ControllerCallback.
- onControllerCreated and onControllerReleased is merged into
onTransferred(old, new)

Rename APIS related to RoutingController.

Bug: 149185558
Test: atest android.media.cts.MediaRoute2InfoTest
  && atest android.media.cts.MediaRouter2Test
  && atest android.media.cts.RouteDiscoveryPreferenceTest
  && atest android.media.cts.RoutingSessionInfoTest
  && atest android.media.cts.MediaRoute2ProviderServiceTest
  && atest mediaroutertest

Change-Id: I348581be7c0b8537da22da3bc81e2ca31e16203f
2020-02-17 16:56:01 +09:00
Kyunglyul Hyun
e8d6f95b29 Merge "MediaRouter2: Remove sendControlRequest" 2020-02-17 06:48:16 +00:00
TreeHugger Robot
34cbb22187 Merge "Tuner JNI: frontendCallback" 2020-02-17 06:13:46 +00:00
Kyunglyul Hyun
c943f212a5 MediaRouter2: Remove sendControlRequest
Unused sendControlRequest is removed.
According to that, MediaRouter2ManagerTest is a little bit
modified.

Bug: 145487522
Test: atest cts realted to media router 2
Change-Id: I3c2c5d1c2c67a3398a45bb2fab4e90dcf90f627e
2020-02-17 14:02:48 +09:00
Kyunglyul Hyun
1682f7a8bc Merge "Link MediaRouter2 from MediaRouter" 2020-02-17 04:55:05 +00:00
Ivan Chiang
9d0bd71ea9 Fix isDocumentMimeType issue in MediaFile
Bug: 149077289
Test: atest MediaFileTest
Change-Id: I541c32d7e44b852999dd1aefa531e7cd88978bc9
2020-02-17 10:42:59 +08:00
Henry Fang
3801d6cb98 Add Invalid Filter/AVSyncID
To allow client to identify invalid filter/avSync ID

bug: 148110220
Test: Manual
Change-Id: Id2d5aada44eb2be32f88277fce4db72d375e5c46
2020-02-16 03:09:33 +00:00
Oscar Azucena
4e4d6e3b85 Remove user id based audio captured API.
Removed recently added user id based routing for audio playback capture.
The original goal of the user id based routing was for the routing to be
controlled by audio policy and to controll where audio from a user
could play. The audio playback capture was added to match similar API
provided for audio playback capture based on application's uid.
Currently, there is no appropiate use case for capturing based on user
id. While this could prove useful in the future the appropiate use case
research must be completed. Updated comments for audio policy user id
based routing.

Bug: 149419551
Test: atest AudioPlaybackCaptureTest
Test: atest
com.google.android.gts.audio.AudioHostTest#testUserIdDeviceAffinity

Change-Id: I174cba618c4f66d11185e7ab5630094b4a8cb35b
2020-02-14 20:59:38 -08:00
TreeHugger Robot
4b059c41d4 Merge "Add a permission for Descrambler" 2020-02-14 22:17:43 +00:00
Eric Laurent
9fc16485f1 Merge "AudioSystem: add owner UID to setPhoneState API." 2020-02-14 18:40:55 +00:00
Kyeongkab.Nam
bd228498f5 Add encoding information to TvTrackInfo
Add TIF API for getting encoding in order for TV App to use it.

Test: m framework update-api
Bug: 112835103
Change-Id: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
2020-02-14 10:40:29 -08:00
Santiago Seifert
590e248491 Add KEY_CAPTION_SERVICE_NUMBER to MediaFormat
Bug: 132153067
Bug: 134057371
Test: Not applicable.
Change-Id: I20eb77ad60f9e5e6cefd591ad168795ce0755b3f
2020-02-14 13:49:07 +00:00
Scott Warner
fb3973a917 RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID
When changing the notification sound for some apps with app-provided sounds,
the notification URI doesn't have a numerical ID.
For example, Outlook's email notification URI has the id 'new_email'

Test: m, outlook doesn't crash anymore, test google calendar
Change-Id: Ibf0c6f2f13e1c76ce02784165b97b92e8f7e432c
2020-02-14 14:33:02 +01:00
Kyunglyul Hyun
f5318efa64 Merge "RouteDiscoveyPreference: Update javadoc" 2020-02-14 10:12:27 +00:00
Kyunglyul Hyun
6e0c08b396 MediaRouter2: s/transferrable/transferable/g
It was s/[tT]ransferrable/$1ransferable/g though.

Bug: 149534504
Test: build & atest mr2 related tests
Change-Id: I7b6cbb51993a5f1673e39f590d65e057d9474315
2020-02-14 15:44:18 +09:00
Kyunglyul Hyun
6945a9bb4d RouteDiscoveyPreference: Update javadoc
Added missing javadoc and updated some to clarify.
Renamed activeScan to performActiveScan.

This CL is to address issues in API review.

Bug: 149299503
Test: make api-stubs-docs-update-current-api
Change-Id: Ic8a630eb65daab190ec6e0a106c81aa6edfbf72d
2020-02-14 14:52:08 +09:00
Eric Laurent
db1b56d9ed AudioSystem: add owner UID to setPhoneState API.
Communicate current audio mode owner UID to native service
when changing audio mode via setPhoneState.

This will be used by call audio capture restriction rules.

Bug: 148368476
Test: manual phone call tests
Change-Id: Ieb1ff01f20d4b70a4f52b6a0e320d8275d90dbfb
2020-02-13 19:01:13 -08:00
shubang
f657da2d54 Tuner JNI: time filter
Test: make; acloud create;
Change-Id: I6bd53f6831e021d14b8d5762850a083acdbcf26a
2020-02-13 18:15:56 -08:00
Jeff Sharkey
3aa4aadac3 Merge "Fail silently on MediaScannerConnection#onScanCompleted" 2020-02-13 23:52:30 +00:00
shubang
333a51344b Add a permission for Descrambler
Most of the broadcast features don't require descrambler.
Use another permission to minimized the access and protect scrambled
contents.

Bug: 139308734
Test: make;
Change-Id: I3cfcf22ee6b0c9218d3db966b3f441d491d8dd03
2020-02-13 14:26:10 -08:00
Amy
92726fb752 Moving TRM under a separate package
Change the TunerResourceManagerListener to ResourcesReclaimListener

Test: make framework-media-tv-trm-sources
Bug:
Change-Id: Id49bfead1b08b4d01adb1a3ae9f354da6d1a75b1
2020-02-13 14:20:06 -08:00
shubang
87788c3118 Parse FilterConfiguration in JNI
Test: make; acloud create;
Change-Id: I66d46e037a408c20a8b48c6363bcdfcb2d889ab9
2020-02-13 18:47:27 +00:00
Kyunglyul Hyun
f108d2f54c Link MediaRouter2 from MediaRouter
Recommend using MediaRouter2 over MediaRouter

Bug: 148379928
Test: N/A
Change-Id: I0fea9f46f6956a42399b9c9b742438168e7b20a7
2020-02-13 21:28:19 +09:00
Amy Zhang
8527147b3d Merge changes from topic "tuner-rm"
* changes:
  Add a TunerResourceManagerService as an Android System Serivce.
  Add Lnb related APIs into the TunerResourceManager interface
  Add Cas related APIs into the Tuner Resource Manager
  Adding ITunerResourceManagerService interface into android.media.tv
2020-02-12 23:48:29 +00:00
TreeHugger Robot
b773bf856d Merge "Fix voice communication audio playback capture" 2020-02-12 14:35:36 +00:00
Nadav Bar
24e0298b57 Fix voice communication audio playback capture
This change fixes the CTS failure in AudioPlaybackCaptureTest caused by
ag/10111312 and ag/10111311.
It contains the following fixes/changes:
  - Capturing of voice communication is only allowed when the caller is
    explicitly asking for an attribute match USAGE_VOICE_COMMUNICATION.
    If an app adds that match rule, then the permission check for
    CAPTURE_VOICE_COMMUNICATION_OUTPUT will take place. For all other
    rules (like UID), the caller will receive silenced audio for voice
    communication.
  - Capture of voice communication will be only allowed for privileged
    capture. Hence other then CAPTURE_VOICE_COMMUNUCATION_OUTPUT, the
    calling app is also assume to have CAPTURE_MEDIA_OUTPUT.
  - Code cleanup, mainly in AudioService.java

This change is accompanied by ag/10242954 on the native side.

Bug: 148559127
Test: Manually
Test: atest PlaybackCaptureTest (with the version prior to ag/10220852)
Test: atest com.google.android.gts.audio.AudioHostTest
Change-Id: I1077db2e0f3c4133fca97d7b461f673bac693676
2020-02-12 16:16:54 +02:00
Kyunglyul Hyun
8239e3f35a Merge "MediaRouter2: Add group volume" 2020-02-12 08:20:50 +00:00
shubang
c8736b787e Tuner JNI: frontendCallback
Test: mannual
Change-Id: I514a4068660e043c7349a0f2d471cf4b11968eed
2020-02-11 20:10:28 -08:00
Amy
06a551ee7b Add a TunerResourceManagerService as an Android System Serivce.
This service is used to interact with TunerHAL interface and the Tuner
framework to manage the Tuner resources currently used on the device.
Tuner framework claims resource from this service. The service will
handle the requests from multiple applications based on their priority.

Sepolicy changes are in https://android-review.googlesource.com/c/platform/system/sepolicy/+/1161873
Test: cuttlefish
Bug:
Change-Id: Ifedc4e6f120e711aadffdf715d8720e0b64fbe16
2020-02-11 19:39:44 -08:00
Amy
cbe55af3a7 Add Lnb related APIs into the TunerResourceManager interface
Update, request and release APIs are added in this CL.

Test: manual
Bug: 147380513
Change-Id: I084f091cef8a7c020afa93539a46725300b102c7
2020-02-11 19:28:42 -08:00
Amy
7894541ea4 Add Cas related APIs into the Tuner Resource Manager
Request, update and release APIs are added in this CL as long as the
related parameter interfaces.

Test: manual
Bug: 147380513
Change-Id: Ie6f119a2fbe45eb09b936d8a5f643206453b6c2a
2020-02-11 19:28:15 -08:00
Amy
4ea3b6d4b1 Adding ITunerResourceManagerService interface into android.media.tv
This CL handles the frontend related APIs.
Please see MediaCas and Lnb related APIs in the CL chain.

Test: manual
Bug: 147380513
Change-Id: I0c463dc29b39fdca0cba07a4a4a445d7a6054c14
2020-02-11 19:27:17 -08:00
TreeHugger Robot
f0c72dd6ba Merge "Fix: Use super Builder class for TsFilterConfiguration" 2020-02-11 23:44:07 +00:00
TreeHugger Robot
4ea476c9c8 Merge "AudioManager: listener for changes to preferred device for strategy" 2020-02-11 21:55:08 +00:00
Jean-Michel Trivi
8d64ebb8b3 AudioManager: listener for changes to preferred device for strategy
Add a listener for being notified when the preferred audio device
for an audio strategy changes.

Bug: 148566862
Bug: 144440677
Test: atest AudioServiceHostTest#testPreferredDeviceRouting
Test: atest AudioServiceHostTest#testDevicesForAttributes
Change-Id: Iff47d6bc7f4bd18c3a8fe48557acf803a4059630
2020-02-11 09:20:47 -08:00
Sahana Rao
364d250fb7 Fail silently on MediaScannerConnection#onScanCompleted
MediaScannerConnection#onScanCompleted callback runs on background
thread. Exception on the callback kills the process. To avoid this,
ignore exceptions from callback for apps targeting Q or lower.

This change fixes change in behavior from refactoring
Ie959daa7576214024150faf84b44cdba00119257 where errors on the callback
was handled on a binder thread that doesn't cause process crash.

Test: atest frameworks/base/media/ directory
Test: "in.mohalla.sharechat" app doesn't crash while sharing video.
Test: "com.vkontakte.android" app doesn't crash while sending a photo.
Bug: 147998630
Bug: 148925602
Change-Id: I5bd5f9fc22ac274da4d09c55dd639a6cca08be9b
2020-02-11 15:20:01 +00:00
Kyunglyul Hyun
5161b37e62 MediaRouter2: Add group volume
Add session volume or group volume info into RoutingSessionInfo.
Group volume can be controlled by MediaRouter2 or MediaRouter2Manager.

This CL includes minor clean up for CTS and MediaRouter2Manager.

Bug: 148994658
Bug: 149200358
Test: atest android.media.cts.MediaRoute2InfoTest
  && atest android.media.cts.MediaRouter2Test
  && atest android.media.cts.RouteDiscoveryPreferenceTest
  && atest android.media.cts.RoutingSessionInfoTest
  && atest android.media.cts.MediaRoute2ProviderServiceTest
  && atest mediaroutertest

Change-Id: If1d3aaae604a3c23d504e620ddb2bd2ffb260602
2020-02-11 16:12:12 +09:00
TreeHugger Robot
ad12755b10 Merge "Change names of stopTune and stopScan" 2020-02-10 19:49:17 +00:00
TreeHugger Robot
6a1e0b72e3 Merge "MediaRouter: clear session info when disconnected" 2020-02-10 08:10:42 +00:00
TreeHugger Robot
87bdd6503a Merge "MediaSessionService: Fix crash with implicit media button receiver" 2020-02-10 07:10:36 +00:00