Commit Graph

7916 Commits

Author SHA1 Message Date
Automerger Merge Worker
f6253ef435 Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f
Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
2019-12-19 11:17:48 +00:00
Austin Wang
a63a2c0130 Revert "Use new UnsupportedAppUsage annotation."
This reverts commit a5264903e2.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269

Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70
2019-12-19 06:38:19 +00:00
Automerger Merge Worker
757ed29038 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce91
Change-Id: I199f8957c0df1d3efeb85cbe8e561e31045ee409
2019-12-19 00:42:17 +00:00
Jean-Michel Trivi
5e851cf9d8 AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING
Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6
2019-12-18 13:24:16 -08:00
Automerger Merge Worker
c7f44bacbe Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d
Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1
2019-12-18 16:21:37 +00:00
Artur Satayev
a5264903e2 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'
Change-Id: I087bb1cecbe59f1cf0c2e770c735d7a433722c6f
2019-12-18 12:07:36 +00:00
Automerger Merge Worker
1625c4d817 Merge changes from topic "msm_callback" am: 7e8dffc582 am: 4dc8b3207b
Change-Id: I387c36213524e474cf1617be02816b5acbde748a
2019-12-17 03:19:58 +00:00
Jaewan Kim
7e8dffc582 Merge changes from topic "msm_callback"
* changes:
  MediaSessionManager: Split abstract class Callback into interfaces
  MediaSessionManager: Use Executor instead of Handler
  Allow to register multiple callbacks in MediaSessionManager
2019-12-17 02:29:33 +00:00
Automerger Merge Worker
b083edb7ad Merge "Use TelephonyManager API to check if device is voice capable." am: c5480019ce am: 8bdcb6c2ce
Change-Id: I4aeee332f002f7777a94c50b85b4601bfec55108
2019-12-13 23:52:55 +00:00
Treehugger Robot
c5480019ce Merge "Use TelephonyManager API to check if device is voice capable." 2019-12-13 23:26:40 +00:00
Michele
72d27bb104 Use TelephonyManager API to check if device is voice capable.
Bug: 146075164
Test: make
Change-Id: I3f19a65012ea355091bbbf22ee3c11054ed19e37
Merged-In: I3f19a65012ea355091bbbf22ee3c11054ed19e37
2019-12-13 14:46:37 +00:00
Automerger Merge Worker
c93513a768 Merge "TIF: Add TvInputService#onHdmiDeviceUpdated()" am: efacbc6cc8 am: c08c2563cf
Change-Id: I9a223167038bb241aeaf0912d31f869c1cc4977b
2019-12-13 10:16:54 +00:00
Kyeongkab.Nam
f6d1e09fd7 TIF: Add TvInputService#onHdmiDeviceUpdated()
Add API to update device infos to TvInputInfo.

Bug: 145047101
Test: Manual
Change-Id: I67438193cc00d3bf76b8ebaa02869b6ff4e04b77
2019-12-13 02:06:12 +00:00
Jaewan Kim
f5ff735fae MediaSessionManager: Split abstract class Callback into interfaces
This CL splits the MediaSessionManager.Callback (abstract class) with
OnMediaKeyEventDispatchedListener and
OnMediaKeyEventSessionChangedListener (interfaces with default methods).

It's to follow the API guideline and also to help the Bluetooth for
minally registering callbacks. (The Bluetooth currently only overrides
onAddressedPlayerChanged)

Bug: 138648566
Test: Build and run
Change-Id: I8607662b00db7fb32cf3f4ee527c52b9fd8a6d7c
2019-12-12 10:23:14 +09:00
Jaewan Kim
c37f70d6fe MediaSessionManager: Use Executor instead of Handler
Bug: 138648566
Test: Build
Change-Id: I89a612cb1408dfb2cc4f624c7e0f8c8a55e0a732
Merged-In: I89a612cb1408dfb2cc4f624c7e0f8c8a55e0a732
(cherry picked from commit 95c783e2d2)
2019-12-12 10:23:06 +09:00
Sungsoo Lim
5fe3d3ae41 Allow to register multiple callbacks in MediaSessionManager
Bug: 126758528
Test: manually
Change-Id: I613593a88c115a5ac694b8c984f3ae36e9cc1c78
Merged-In: I613593a88c115a5ac694b8c984f3ae36e9cc1c78
(cherry picked from commit 14ddf75c47)
2019-12-12 10:22:55 +09:00
Marco Nelissen
1f20c66f56 Merge "Fix bad javadoc link" am: b002876a41
am: b6aaed3796

Change-Id: Ic8767b6afc40789a6b6c11c20edc61ede8da3c87
2019-12-06 14:42:45 -08:00
Marco Nelissen
b002876a41 Merge "Fix bad javadoc link" 2019-12-06 22:30:15 +00:00
Marco Nelissen
738d5e11ce Fix bad javadoc link
Method link was referring to itself.

Bug: 144964777
Test: build offline-sdk-docs, open doc in browser
Change-Id: Ib373b16d36ee91ebe10f5c6c2a635c65480a48e0
2019-12-06 10:37:31 -08:00
jiabin
621c415f5e Merge "Refactor audio device type in audio frameworks." am: dd2c24061d
am: 13d789d480

Change-Id: Id30c38a272831566a02680cff43072a45376b61d
2019-12-06 09:39:53 -08:00
Eric Laurent
042d6f1095 Merge "AudioService: communicate audio HAL process pids to native audioserver" am: e16beef1cd
am: 917934e7e5

Change-Id: I2ccce2d261e42e3c33d974d30b71bcebd0493f1b
2019-12-05 15:43:33 -08:00
jiabin
955b2132b1 Refactor audio device type in audio frameworks.
As audio device type can not be used as bit mask any more, refactoring
the code to use a set for a combination of audio device type instead.

Bug: 135621476
Test: atest AudioDeviceBrokerTest
Test: audio smoke test
Change-Id: I2c6fabfafcc6eaf607975076d9ee1a78887a2c85
Merged-In: I2c6fabfafcc6eaf607975076d9ee1a78887a2c85
2019-12-05 15:32:44 -08:00
Eric Laurent
a270b7c0e5 AudioService: communicate audio HAL process pids to native audioserver
Retrieve audio HAL processes pids from service manager and send them
to AudioFlinger native service. This is needed to dump audio HAL process tombstones
and because audioserver process does not have the SELinux permission to
list services.

Bug: 141528385
Test: Force watchdog and verify tombstone creation
Change-Id: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
Merged-In: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
2019-12-05 12:51:41 -08:00
Automerger Merge Worker
bc7cfe6370 [DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b am: e5151f8012
Change-Id: I3e0217a9954b8b134431682657d90f06408388b0
2019-12-04 02:56:04 +00:00
Automerger Merge Worker
e5151f8012 [DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b
Change-Id: Id28d26d99b0e2df0a43ef6f6e8034957343271f8
2019-12-04 02:41:19 +00:00
Jin Seok Park
013afc4daf [DO NOT MERGE] Return correct offsets for getAttributeRange()
Cherry-picked from ag/9745767

Currently, the offset value returned from getAttributeRange() does
not take into account the offset to the EXIF data within the image
file. This CL fixes the code to return the correct offsets.

The existing test code could not detect this issue because it does
not explicitly seek to the given offset and retrieve/compare the
data. This CL also adds test code to do this. Make tag information
is also added because all test files have this information, while only
a select few have thumbnail/GPS tag information.

This CL also fixes a bug where the thumbnail offset was not being
updated if the data was passed with StripOffsets tag.

Bug: 143118731, Bug: 143663411
Test: atest ExifInterfaceTest
Change-Id: Ia147cdcacf4699c5e7efc43f52e58b945032a51f
2019-11-20 13:30:22 +09:00
Robert Horvath
85e44e1976 Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f
am: 16a5ce0026

Change-Id: I1b3eb99edaef15e43f2c10e4bbc67665455d74f4
2019-11-18 01:10:38 -08:00
Robert Horvath
7fba59ebcb Merge "Add OWNERS for media TV" am: 4776c31c22
am: e207293928

Change-Id: I786b4bd5bd8463d1217c9ca1f9e91d673498c4bc
2019-11-18 01:09:21 -08:00
Robert Horvath
16a5ce0026 Merge "Rename OWNER to OWNERS for media/tv"
am: a4ff2b159f

Change-Id: I6fb78bc065217e79f3425d999ee75e37fe2edc4c
2019-11-18 01:07:48 -08:00
Robert Horvath
e207293928 Merge "Add OWNERS for media TV"
am: 4776c31c22

Change-Id: I218c902b159ed68aa083130287d41fc7806bae5d
2019-11-18 01:05:37 -08:00
Robert Horvath
a4ff2b159f Merge "Rename OWNER to OWNERS for media/tv" 2019-11-18 08:13:40 +00:00
Robert Horvath
4776c31c22 Merge "Add OWNERS for media TV" 2019-11-18 08:10:47 +00:00
Robert Horvath
ff389051bf Rename OWNER to OWNERS for media/tv
OWNERS file was misspelled.

Test: n/a
Change-Id: If71bebd6a0a7c7e7242e485fc27da0fdb70a7e96
2019-11-12 15:47:01 +01:00
shubang
8da39947ad Add OWNERS for media TV
Nick is the TLM of media TV.
Adding OWNERS to avoid bugging people from other media teams

Test: n/a
Change-Id: I2c99a7a1ab78c634fc94dfe96b6617b0bde4efdf
Merged-In: I2c99a7a1ab78c634fc94dfe96b6617b0bde4efdf
2019-11-12 15:45:37 +01:00
Artur Satayev
756d3b447a Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
am: 7a565c45b1

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1 Merge "Add @UnsupportedAppUsage annotations for greylist."
am: 423c3a32d6

Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Artur Satayev
fc46be7dbd Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Pawin Vongmasa
a802a56b45 Merge "MediaCodec: Release lock before calling onFrameRendered()" am: c03b91a7ef
am: 23b72c725c

Change-Id: I5615c10df08d88ef397bd28eaa23582503d4356f
2019-11-08 06:06:30 -08:00
Pawin Vongmasa
23b72c725c Merge "MediaCodec: Release lock before calling onFrameRendered()"
am: c03b91a7ef

Change-Id: I362a0153d83363b0c2b419480dcbe01df6976a90
2019-11-08 06:00:38 -08:00
Pawin Vongmasa
5a07fb4e59 MediaCodec: Release lock before calling onFrameRendered()
Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 143672592
Change-Id: I4fb55eb8a90913544a793097c977fee539e09776
2019-11-07 15:54:54 -08:00
Joshua Baxter
3e878bda5a Merge "docs: fix typo" into qt-dev am: 49357cbf9e am: 01b5ee8eca
am: bcc7d237a6

Change-Id: I631367114c9fb8509c50c9b8d43dcb4da8a328b8
2019-11-06 14:22:16 -08:00
Joshua Baxter
bcc7d237a6 Merge "docs: fix typo" into qt-dev am: 49357cbf9e
am: 01b5ee8eca

Change-Id: I449250128879b14a4cf9da7c43f8d40af765c4d6
2019-11-06 14:05:27 -08:00
Joshua Baxter
e14bb68ce1 docs: fix typo
Change-Id: Ia0dab15920fdbead1842ff5a20ec6d4988f11fbe
test: make ds-docs
bug: 79355169
Exempt-From-Owner-Approval: docs-only change
2019-11-06 21:20:37 +00:00
Shuzhen Wang
eae340df69 Merge "ImageWriter: Do not override UNKNOWN format twice" into qt-qpr1-dev
am: b78d7355b7

Change-Id: I7d1946267cfe2ea848850cac494dd2a8bd383755
2019-10-31 07:55:59 -07:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Shuzhen Wang
db1322fab1 ImageWriter: Do not override UNKNOWN format twice
Currently when application calls ImageWriter.newInstance(Surface, int,
int), the default format of UNKNOWN is overridden to surface format in
Java side before being overridden again to user specified format (from
RGBA to IMPLEMENTATION_DEFINED). This breaks backward compatibility with
certain gralloc implementations.

Do not override UNKNOWN format in Java side.

Test: testWriterFormatOverride
Bug: 143637345
Change-Id: Ie61157bca11f623eff2b8c0ed2a988c86da07cb2
2019-10-30 21:17:48 +00:00
Nick Chalko
3a6f4226ca Merge "Add OWNERS for media/tv files" am: c91c7ab339
am: a0f0da0bd1

Change-Id: I75dbf8c9ecd9827b216933af11acef856cd3a6aa
2019-10-29 15:52:55 -07:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Jean-Michel Trivi
54ca7f7696 Merge "AudioService: handle errors when reconnecting mixes after server crash" am: 0ac7e561e9 am: 933083b88c
am: d9b96d99a1

Change-Id: Ifaaf16f32a7e9a4cc1136ee0c124f4a0914e6c4b
2019-10-23 10:13:25 -07:00
Marco Nelissen
047c40807e Merge "Move MidiDeviceInfo to libamidi, its only user" am: 7a2fb04c22 am: e399a7f824
am: 72fab3af33

Change-Id: I001aed6c2d8cf0104f1c079d2628a1ba3cbe3f28
2019-10-23 10:03:37 -07:00