Commit Graph

7967 Commits

Author SHA1 Message Date
Jay Patel
f7cbbae9e4 Merge "Fix TvRecordingClient api issues" am: cce2ca958e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/972628

Change-Id: Idf510533785e6bd513480c283648666c29ec7847
2020-06-05 03:16:30 +00:00
Baohe.Wang
c46177f00f Fix TvRecordingClient api issues
Bug: 134042967

Change-Id: I457c9a2f70641ea174bddb236b855f2d7b7acecb
2020-06-05 02:43:45 +00:00
James Wei
7c7680f261 Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc62
Original change: undetermined

Change-Id: Idd913941d77d59b4de4325043dd7f40c5188de1d
2020-06-02 06:27:44 +00:00
joker.yang
5be80641b7 use updated mStorage for new MtpObject when copy file between storages
copy file from sdcard to internal storage through MTP,
then the file can't be renamed

bug: 147715888

Change-Id: Iffeeeb1372e0ecf305cf0c70edb601a4b2001342
2020-05-30 06:39:25 +00:00
Treehugger Robot
d14004d53b Merge changes from topic "ctor-refs" am: 1ac3746aa8
Change-Id: I974af9e767cb3683a4b5afedf4e30d2f33c88477
2020-05-05 21:12:08 +00:00
Andrew Sapperstein
23d5746e06 Fix broken @see tags in public documentation. am: 1f6e22cbd8
Change-Id: I04a78c9ba3770a4d651177aae697890094a52add
2020-05-05 21:12:04 +00:00
Andrew Sapperstein
2e5f38e0bf Update inner class constructor refs to use proper syntax.
Previously, we generally required fully qualified names for referring
to inner class constructors (like #Notification.Builder()) despite that
not being valid javadoc. Now, we properly support #Builder() syntax and
the old syntax will error.

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
Merged-In: Ib2e4360493275b79c72487ee1cb173bb5e0fd35f
2020-05-01 00:43:54 +00:00
Andrew Sapperstein
1f6e22cbd8 Fix broken @see tags in public documentation.
These were previously being suppressed by doclava but with this change,
all failures are fixed and the suppression logic has been removed.

To fix the issues, there were a few possible changes made:
- broken reference to a public API (such as incorrect parameters): fixed
- unnecessary @link inside an @see tag: fixed
- @see referring to an @hide or @SystemApi: reference removed
- broken references to inner class constructors
 - worked around by fully qualifying the constructor

Bug: 6963924
Test: make doc-comment-check-docs
Change-Id: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
Merged-In: Ifbdce2de96cdffa560bd90f549fa7184d1f9af85
2020-05-01 00:42:22 +00:00
Eric Laurent
4681122d1f Merge "AudioService: fix AudioProductStrategy matching rule" am: c48b0c9e96
Change-Id: Ib3160d8aaec8a3c28f51e794e12637172a7788ad
2020-04-13 21:58:32 +00:00
Francois Gaffie
05672e534e AudioService: fix AudioProductStrategy matching rule
Strategies use rules on attributes, and use public getter
to compare usages. However, some usage are system only and
now filtered by public getter.
This CL fixes this issue by adding a hidden get for usage
that return whatever public or system usage.

Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest#testAudioAttributesToStreamTypes com.android.audiopolicytest

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Iddd55af8f230cb063dcaa9ba950b890cbbb81643
Merged-In: I377e840b18443c33fb0b562b27fbc706aaeb8055
2020-04-13 18:42:34 +00:00
François Gaffie
f8709ba43c AudioSystem: add annotation on API used by CTS media am: adcbf9004a
Change-Id: I8d1bd14512bff6b3abbc3fe57068d3caa99c3920
2020-04-07 21:35:08 +00:00
François Gaffie
adcbf9004a AudioSystem: add annotation on API used by CTS media
Add @TestApi for the class so some methods and
constants can be visible to test API.
  Also @hide for all other members of the class
that are not @TestApi, as they are exposed to the
test API visibility.

Bug: 136121584
Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioVolumeGroupChangeHandlerTest
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testPermissionsForVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateProductStrategies
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testGetAndValidateVolumeGroups
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributesWithInvalidAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testSetGetVolumePerAttributes
run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

Change-Id: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
Merged-In: Iff9abda2cf971d9c234dcf7df7c2b9a4ad5294c3
2020-04-07 18:07:26 +00:00
Treehugger Robot
9e3782a2de Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" am: e0f643dd3c
Change-Id: Ia4fb1c4b5f7972531c3f71201f25761396d85dfc
2020-03-25 18:16:26 +00:00
Jean-Michel Trivi
01a8d9d840 setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING
AudioService: make setWiredDeviceConnectionState enforce the
privileged MODIFY_AUDIO_ROUTING permission

Bug: 151240738
Test: verify plug/unplug headset is WAI
Change-Id: Icde5c2fdfa970baf596d00f808dca8300be8743f
2020-03-25 09:16:46 -07:00
Xin Li
3f0bfe4608 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I62d3293f617f630d3d2a3d5f67b764bf272769bf
2020-03-19 10:10:35 -07:00
Andrei Litvin
6f5847cb3c Set owners for the tv remote service aidl files.
I added one line for each file since it seemed easier to read
than a comma separated list. This seems consistent with
services/core/java/com/android/server/pm/OWNERS

Test: not applicable

Change-Id: I8ccb7e59896bec40d32864c2d3f750e3b1a517b5
2020-03-18 10:34:45 -04:00
Mikhail Naganov
7dcb80ce2f Visualizer: Ensure multi-thread safety
Add @GuardedBy annotations and ensure they are met when
doing an ErrorProne build.

Refactored Java code to simplify handling messages
from the native code by using 'Handler.post' with
Runnable instances.

Bug: 149375271
Bug: 151442554
Test: RUN_ERROR_PRONE=true m framework-minus-apex
      check warnings for Visualizer class
Test: run EffectsTest for Visualizer both in single
      threaded and multi-threaded usage scenarios,
      validate there are no lockups in the app
      and no messages from FORTIFY in the log
Change-Id: I50752fad02f2a23ed8d0368b2550dbf7f879a706
2020-03-17 12:44:12 -07:00
Automerger Merge Worker
01cba26519 Merge "Set/get allowed capture policy via AudioService." into qt-qpr1-dev am: f1f04649b5
Change-Id: I051513d52ec76ffd2b0c1fbc2a9b1b7a77e27cd7
2020-03-05 12:12:56 +00:00
jiabin
55e8fd2352 Set/get allowed capture policy via AudioService.
Do not call AudioSystem.setAllowedCapturePolicy directly in
AudioManager. Instead, send the request to AudioService and calling the
function in AudioService. In that case, AudioService can cached the
request so that it benefits returning correct playback configuration.

When querying capture policy, AudioManager will query AudioService first
to see if there is cached capture policy. If there is exception, return
cached capture policy in AudioManager.

Test: dumpsys audio, query active audio playback configuration
Test: atest AudioManagerTest, AudioAttributesTest
Test: atest AudioPlaybackCaptureTest, AudioPlaybackConfigurationTest
Bug: 145115448
Change-Id: I170571d8a67839bc5a53991d6c89127b99b5c794
Merged-In: I170571d8a67839bc5a53991d6c89127b99b5c794
(cherry picked from commit b33f36971d)
2020-03-03 07:38:38 +00:00
Automerger Merge Worker
0396aae65b Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" am: ff78aab391
Change-Id: Ia4af051076066cb3cd66cb5d95162339b989dad4
2020-02-18 22:06:22 +00:00
Andy Hung
ff78aab391 Merge "RingtoneManager: Don't crash if the ringtone doesn't have a numerical ID" 2020-02-18 21:48:53 +00:00
nchalko
e982fa4084 Merge "Add encoding information to TvTrackInfo" am: f3681741e3
Change-Id: Id263372457ab5849cdadd3f6788c64ad462310fe
2020-02-18 21:11:28 +00:00
Kyeongkab.Nam
ada0f3079c Add encoding information to TvTrackInfo
Add TIF API for getting encoding in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
Merged-In: I975dda20f129cb05d55eb59a1a60bcdb22b2533e
2020-02-18 17:45:00 +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
Treehugger Robot
71ab50ae23 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Automerger Merge Worker
513b456663 Merge "TvProvider API standardization for ATSC3.0 and DVB" am: 19f99b96eb
Change-Id: Ic859063c1dacbad5152b5210fae0c410219e77bc
2020-02-05 21:23:12 +00:00
Xin Li
5b8d15365a DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I7939379e221123a74b387bf78ce90d68e0468ff0
2020-02-05 10:45:09 -08:00
Kyeongkab.Nam
5d08d4f235 TvProvider API standardization for ATSC3.0 and DVB
TvProvider API standardization and customization for Digital Tuner TV
Input support. (Programs.COLUMN_EVENT_ID, ProgramColumns.COLUMN_SPLIT_ID,
Programs.COLUMN_GLOBAL_CONTENT_ID, Channels.TYPE_ATSC3_T,
Channels.COLUMN_GLOBAL_CONTENT_ID)

Bug: 139424812
Bug: 139425741
Test: Manual
Change-Id: Idb4158cd2c9833ce9dd007de3b8fc5ccfe2a36b4
2020-01-31 11:10:13 -08:00
Automerger Merge Worker
33e7011c7f Merge "audiomanager: fix volume group callback" am: bb10358ac2
Change-Id: I1f9329952a84a5fe2463163600793771ffe253c5
2020-01-31 16:05:58 +00:00
François Gaffie
9a2725c0b7 audiomanager: fix volume group callback
The AudioVolumeGroup change callback for a given group may be lost.
It is due to a poor copy paste in the Handler implementation where
the previous messages where removed.
In the case of volume group, it is forbidden to remove handled message
otherwise previous group change will not be reported.

Test: run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioManagerTest#testVolumeGroupCallback
Bug: 136121584
Change-Id: I7434e66f02143c7da0f7156347d899e81467ee98
Signed-off-by: François Gaffie <francois.gaffie@renault.com>
2020-01-29 10:25:07 -08:00
Automerger Merge Worker
c7fa9073aa Merge "TIF: Add content ratings" am: 0a69a874a7
Change-Id: I07e3a41bfea72c0b5a9920b8da8e12f578bdbaba
2020-01-24 04:25:54 +00:00
Kyeongkab.Nam
bbed3d5492 TIF: Add content ratings
Put comments for the newly added DTMB, New Zealand
and Thailand rating strings.

Test: manual
Bug: 112835405
Change-Id: I4b1e8b87efdd675bdcddec86433164518da0f2bf
2020-01-24 02:49:07 +00:00
nchalko
5a55714a9e Merge "Update documentation for TV DVB devices."
am: 315e9d65d7

Change-Id: Ibcacfcfedbc0fd27d8156dbb2943441339240884
2020-01-23 10:14:49 -08:00
Nick Chalko
aafdda0247 Update documentation for TV DVB devices.
Change-Id: Idcc80691be435e755203e9dd30a439c06ba0a5b5
Test: m framework-all update-api -j
Bug: 148065722
2020-01-23 09:13:02 -08:00
nchalko
7e6df33644 Merge "Fix equals and hashCode APIs on TvTrackInfo"
am: 2e8d16f714

Change-Id: I3a88659ad590b1e7c62840e6d737befa4a7d4ecd
2020-01-22 15:39:05 -08:00
Kyeongkab.Nam
b30b38506b Fix equals and hashCode APIs on TvTrackInfo
Current hashCode API cares only for mId and it returns same values
even if other member variables are different.
To avoid for returning same values between different TvTrackInfo of
each program, hashCode API should care all variables used on
equals API. Note that mId is defined as unique only in the same
program.

Test: build
Change-Id: I4d72f6ce80141d92f86e548804e1f0257ed6fcfb
2020-01-22 11:10:32 +09:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Artur Satayev
53ada2ab28 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a
Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-14 15:54:55 +00:00
Eric Laurent
a25bf98613 AudioEffect: add contructor for device effect
Add a @SystemApi constructor to AudioEffect class
allowing to attach an audio effect to an input or output
device.

Bug: 136294538
Test: make
Change-Id: I0cb5cf5f38f95605a8605f3347aaa7e187db4e8a
Merged-In: I0cb5cf5f38f95605a8605f3347aaa7e187db4e8a
2020-01-10 11:28:00 -08:00
Jean-Michel Trivi
9f7e6eb601 AudioDeviceAddress: new class to store audio device information
Introduce a new class to store information about an audio device,
containing its role (input or output), device type and address.

Bug: 144440677
Test: atest AudioServiceHostTest#testAudioDeviceAddress
Change-Id: I86d32590c54609b8d8a9f7ea60d9b4bf76113935
Merged-In: I86d32590c54609b8d8a9f7ea60d9b4bf76113935
2020-01-10 11:28:00 -08:00
Automerger Merge Worker
859b6345c3 Merge "Use new UnsupportedAppUsage annotation." am: 57a0beab18 am: 2eff83dcb3
Change-Id: I48f93c43b66f4d329ef6068b4f74b4c68809c099
2020-01-10 15:17:50 +00:00
Artur Satayev
7651f0a4c0 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
Merged-In: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
2020-01-09 15:13:52 +00:00
Automerger Merge Worker
de4117c1cd Merge "Add spoken subtitle information to TvTrackInfo" am: e515bb6fb6 am: 2fba623381
Change-Id: I0b198c59944430638650e0a2294a193114d3ded9
2020-01-09 04:52:17 +00:00
Kyeongkab.Nam
f692b95b2a Add spoken subtitle information to TvTrackInfo
Add TIF API for getting spoken subtitle attribute for audio tracks
in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I2ebc27dae020bce14cd1a3464e91416c7a4415ec
2020-01-09 09:13:08 +09:00
Automerger Merge Worker
b373c7f8d3 Merge "Add hearingImpaired information to TvTrackInfo" am: 53379f83d1 am: 84ffee36cd
Change-Id: I2ac5ec9f0d19774cc9af3ae887c20e139044a10a
2020-01-08 18:44:09 +00:00
Kyeongkab.Nam
8bbcf8aae5 Add hearingImpaired information to TvTrackInfo
Add TIF API for getting hearing impaired attribute for audio and
subtitle tracks in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I4046b5d49fcec2b944972bc532e844f0bdab9476
2020-01-08 17:51:27 +09:00
Automerger Merge Worker
4dd0da999b Merge "Add audio description information to TvTrackInfo" am: f04ee52d5a am: d0d2f7222f
Change-Id: Id2db7faafbd8a12cd5e46aacbfb32db9ac0d18b5
2020-01-08 03:27:10 +00:00
Treehugger Robot
f04ee52d5a Merge "Add audio description information to TvTrackInfo" 2020-01-08 02:43:24 +00:00
Automerger Merge Worker
9273dd9bc3 Merge "Mark DVB methods and classes as System APIs." am: 046609406d am: acb2a3c481
Change-Id: I47c18f8c7cae7cca62440edcdb05913bc7dc5431
2020-01-06 20:34:54 +00:00
Automerger Merge Worker
1c80c22f40 Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced am: 98274d96f5 am: 9868e4c737 am: 03bdd73cca
Change-Id: I1dd0de6e7c63fd6199def4578aef323af9322f90
2020-01-02 22:05:29 +00:00