Commit Graph

19589 Commits

Author SHA1 Message Date
TreeHugger Robot
053a3859a8 Merge "MediaSession2: Add reset() to the MediaPlayerBase" 2018-03-02 23:58:14 +00:00
TreeHugger Robot
3c4c64455e Merge "Add a HINT_KEYWORDS to Slice" 2018-03-02 19:14:26 +00:00
Vladislav Kaznacheev
f1aab4de20 Merge "Add ViewConfiguration.shouldShowMenuShortcutsWhenKeyboardPresent" 2018-03-02 17:34:04 +00:00
TreeHugger Robot
f10700343c Merge "Add HIDDEN_API_BLACKLIST_EXEMPTIONS to @TestApi." 2018-03-02 09:57:14 +00:00
Mathew Inwood
5518c752ba Add HIDDEN_API_BLACKLIST_EXEMPTIONS to @TestApi.
It's used by a CGTS test.

Bug: 64382372
Test: It builds
Change-Id: I4bde625a89896140b2e8bf585d16074d290c0fc9
2018-03-02 09:51:28 +00:00
Jaewan Kim
de2bbb322b MediaSession2: Add reset() to the MediaPlayerBase
This would be used in response to
  - MediaController2#play()
  - KEYCODE_MEDIA_STOP

Bug: 64098437
Test: passed MediaComponentTest
Change-Id: I7cd4d855d5e1bf8e4260a9b920f30dfe2eea44e1
2018-03-02 18:03:42 +09:00
Bo Zhu
0f0d1ab1d3 Merge "Check the public-key signature of the whole certificate file before accepting the certificates" 2018-03-02 08:52:36 +00:00
Mady Mellor
15e2c5d54d Add a HINT_KEYWORDS to Slice
Want to be able to support allowing a Slice to specify some keywords
associated with it; need a new hint to identify these.

Bug: 74086214
Test: make
Change-Id: I79d3f1806eecf416f5e3ae09451b90507b382c24
2018-03-02 00:54:15 +00:00
Jiuyu Sun
595182423f Merge "Add result code for eUICC card not found." 2018-03-01 19:21:32 +00:00
TreeHugger Robot
5130fdb0ac Merge "cas: explicitly define possible key id values" 2018-03-01 18:50:18 +00:00
Arthur Ishiguro
f0cda31e00 Merge "Mark location classes as Parcelable appropriately" 2018-03-01 17:10:14 +00:00
Adrian Roos
90c27c332a Merge "DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode" 2018-03-01 13:57:22 +00:00
TreeHugger Robot
8f7aa97fa9 Merge "MediaPlayer2: clean up APIs" 2018-03-01 07:28:35 +00:00
Jean-Michel Trivi
38008955e3 Merge "AudioPolicy: support for add/remove AudioMix without unregistering" 2018-03-01 07:00:39 +00:00
TreeHugger Robot
3b0014dcad Merge "MediaSession2: Unhide setAudioFocusRequest" 2018-03-01 05:11:24 +00:00
Jean-Michel Trivi
af576a0e4f AudioPolicy: support for add/remove AudioMix without unregistering
System API for a registered AudioPolicy to attach or detach
  AudioMix without having to unregister, and then registering
  the new mix configuration.

Bug: 63906162
Test: AudioPolicyTest

Change-Id: Ib2fea8aa034d3f7b498e76dc1fc51c1ea508d3a2
2018-02-28 21:06:20 -08:00
Wei Jia
1789cc7f82 MediaPlayer2: clean up APIs
Make MediaPlayer2 derived from MediaPlayerBase
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ib31e3196ad65c694f778a8a79277e53017a7026f
2018-02-28 19:52:13 -08:00
TreeHugger Robot
c7c1ce8012 Merge "MediaSession2: Refine APIs" 2018-03-01 03:39:31 +00:00
Sungsoo Lim
12a1f62745 MediaSession2: Unhide setAudioFocusRequest
Bug: 64098437
Test: make update-api
Change-Id: I9244719e1a771ab7b420a95af6ba43faef7b352c
2018-03-01 12:31:52 +09:00
Arthur Ishiguro
f3ab9cdc41 Mark location classes as Parcelable appropriately
Doesn't add the "final" qualifier,
since make will throw errors due to compatibility issues.

Bug: 69622177
Test: Run CHQTS from master and oc-mr1-dev, verify pass
Change-Id: If02203d7862e77ca4fda7b95a39bbfa3d9f6d87d
2018-03-01 03:10:57 +00:00
Sungsoo Lim
aa080a80a6 MediaSession2: Refine APIs
Bug: 64098437
Test: passed MediaComponentTest
Change-Id: I40e1ef141e47d17e2bfa0a689a680b45a3d73b03
2018-03-01 10:38:33 +09:00
TreeHugger Robot
4f7c46585d Merge "NEW API: Add Image.getHardwareBuffer()" 2018-03-01 01:26:14 +00:00
TreeHugger Robot
30982facc5 Merge "Finish ops started on behalf of a removed package." 2018-03-01 01:11:35 +00:00
TreeHugger Robot
06b1df657a Merge "Use start/finish app ops in window manager" 2018-03-01 01:11:25 +00:00
Jean-Michel Trivi
2175b9a8b2 Merge "Ringtone: unhide looping and volume control" 2018-03-01 00:57:31 +00:00
TreeHugger Robot
19130fea91 Merge "More work on issue #73301635: Ability to extract device configuration" 2018-02-28 23:19:13 +00:00
TreeHugger Robot
379374b1d3 Merge "Added an api to query ForcedAppStandby state" 2018-02-28 22:28:30 +00:00
Mathias Agopian
3e88ed82e5 NEW API: Add Image.getHardwareBuffer()
This mirror the corresponding NDK API. For some
reason this was missing from the java version
of Image.

Bug: 73784759
Test: manual
Change-Id: Iafa6dedda809fe38ea4453d9873d1ba886f88481
2018-02-28 22:23:54 +00:00
Jean-Michel Trivi
e00f31b3f2 Ringtone: unhide looping and volume control
Also clean up whitespace in file.

Bug: 22182606
Test: adb shell clrgt --loop true --volume 50
Change-Id: I937b678f72b4a47b0f02b3124669e2de5e743033
2018-02-28 12:57:55 -08:00
Svet Ganov
a7a0db6c93 Finish ops started on behalf of a removed package.
Two issues here - ops stated for a package that went away
by another package were not marked as finished. And when
the process that started the ops died we did not finish
all nested ops.

Test: atest android.permission.cts.AppOpsTest

bug: 64085448

Change-Id: Id57b3043605a65f2dfc1eea50b81793dd86f58d1
2018-02-28 12:42:08 -08:00
Jason Monk
0e35073ec9 Merge "Add APIs to look into whats in an Icon" 2018-02-28 20:01:09 +00:00
Bo Zhu
7f414d94fc Check the public-key signature of the whole certificate file before
accepting the certificates

This change requires an additional param to the initRecoveryService()
API to take in the public-key signature.

Bug: 73904566
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I2aeead1fda51b6cd8df71ed3b5066342ebc8d5ea
2018-02-28 11:58:30 -08:00
TreeHugger Robot
67e5ac94cd Merge "deprecate EmbossMaskFilter" 2018-02-28 19:55:15 +00:00
Dianne Hackborn
337e01ac10 More work on issue #73301635: Ability to extract device configuration
Now include Gl extensions (thanks to whoever wrote the code
I copied!).

Tweak the protos a bit to include missing info and correct
some things.

Add some new test APIs that are needed for CTS.

Bug: 73301635
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerGetConfigTests
Change-Id: Ie3f8173d217468246e8b6c7f45b7cbfcb352d60f
2018-02-28 11:29:20 -08:00
TreeHugger Robot
824095856b Merge "Allow chaining ImageDecoder's setters" 2018-02-28 19:05:29 +00:00
Chong Zhang
cd53855311 cas: explicitly define possible key id values
Remove cas header from media jni headers, and define flags
for PES header extraction.

bug: 73898003

test: CTS MediaCasTest, MediaDrmClearkeyTest

Change-Id: I2a512e2dbeb8be53a64bfa0b89254032c7341fa2
2018-02-28 10:57:15 -08:00
TreeHugger Robot
f10f40b03c Merge "setPreferRamOverQuality -> setConserveMemory" 2018-02-28 18:47:03 +00:00
TreeHugger Robot
7f1bceb325 Merge "MediaPlayerBase API" 2018-02-28 16:36:23 +00:00
Adrian Roos
2292031e3d DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode
Allows native apps to request a layoutInDisplayCutoutMode without
having to implement a custom NativeActivity subclass.

Change-Id: I0b7fd4624e89fabe177462d615360442f72a1e11
Fixes: 73807928
Test: atest PhoneWindowTest
2018-02-28 16:43:16 +01:00
TreeHugger Robot
5240541e01 Merge "Remove @removed from APIs still in use" 2018-02-28 13:43:36 +00:00
TreeHugger Robot
58c83fa7c8 Merge "Unhide VideoView2 APIs" 2018-02-28 10:43:38 +00:00
Robert Berry
5af199c56e Remove @removed from APIs still in use
I completely misunderstood this annotation.

Bug: 73962883
Test: ran unit tests
Change-Id: Id3e3863fc6fd1e0614a3c75d25cd35239667eaf0
2018-02-28 10:31:43 +00:00
TreeHugger Robot
dc66a1d891 Merge "Unhide MediaControlView2 APIs" 2018-02-28 10:28:25 +00:00
Insun Kang
b785faa1d7 Unhide VideoView2 APIs
Test: make update-api
Bug: 64293205
Change-Id: Ie57e3ea78dd623fc095c1ad5f270f3b97320f155
2018-02-28 08:45:37 +00:00
Maurice Lam
805ea225b9 Merge "Revert "Small fixes to StatsManager API."" 2018-02-28 07:20:36 +00:00
Jean-Michel Trivi
c3a438f65b MediaPlayerBase API
Define as an abstract class the high level interface for
  media players. Consumers are MediaSession2, providers
  are MediaPlayer2, which will extend this class.

Bug: 64098437
Test: to be in MediaPlayer2 tests once it extends MPB
Change-Id: Id0d0fcb6d1b377a0e05a4a8e3d659e12a58fc45e
2018-02-27 22:53:25 -08:00
TreeHugger Robot
7f88497514 Merge "Dynamics Processing Effect" 2018-02-28 06:19:35 +00:00
Jin Seok Park
a64d4b98b5 Unhide MediaControlView2 APIs
Test: make update-api
Bug: 64293205
Change-Id: Ia202a7fc1f8733cc2d95d13e7126916affe4f52e
2018-02-28 05:06:10 +00:00
Brad Ebinger
e9113e9046 Merge "Modify shouldProcessCall API to remove redundancy" am: 59391aa4a0 am: 8f2c2ca09a
am: 27617a9894

Change-Id: Id4638c9126cce687bb4513731be2aeb962b2250d
2018-02-28 04:59:52 +00:00
Maurice Lam
c0df1f2354 Revert "Small fixes to StatsManager API."
This reverts commit 16dcd33abd.

Reason for revert: b/73975175

Bug: 73975175
Change-Id: I5bcccde100900b1370c2e43b8bcfc7d1697e5c72
2018-02-28 04:17:25 +00:00