TreeHugger Robot
a5014f298c
Merge "Remove @removed trySetQuietModeEnabled"
2018-01-26 16:14:04 +00:00
Tony Mak
7699a19d2b
Remove @removed trySetQuietModeEnabled
...
Context:
Updated the API according to API council feedback. Marked it as
@Removed and keep it for a while for Launcher. But now Launcher
prebuilt is updated, we are safe to remove it.
Test: Build
BUG: 71818127
Change-Id: I33fec12addf7031bfbcd86bce9e636c31d0ea4d3
2018-01-26 16:13:44 +00:00
Insun Kang
0a16f268f5
VideoView2/MediaControlView2: Remove overriden onKeyDown/dispatchKeyEvent
...
Test: build
Change-Id: I4f3a397001e771eac1d1f0208d4e2f262c76b44c
2018-01-26 19:32:34 +09:00
Hyundo Moon
6cb0712c53
Merge "VideoView2: Add custom actions API"
2018-01-26 09:42:02 +00:00
Adam Lesinski
1caef5b882
Merge changes from topic "revert-assetmanager2"
...
* changes:
Revert "Replace AssetManager with AssetManager2 implementation"
Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
Revert "libandroidfw: Improve performance of AssetManager2"
2018-01-26 06:55:27 +00:00
Insun Kang
51e8d0a050
Merge "VideoView2: Apply API review comment"
2018-01-26 06:55:13 +00:00
Jaewan Kim
bdbd7a62c2
Merge changes from topics "mediaplayerinterface", "mediasession2_executor"
...
* changes:
MediaSession2: Change MediaPlayerBase to MediaPlayerInterface
MediaSession2: Use Executor for callback handling
2018-01-26 05:36:23 +00:00
TreeHugger Robot
b0db811fe9
Merge "Statsd and frameworks reference proto enums"
2018-01-26 05:02:35 +00:00
Jaewan Kim
1a2c263c7a
MediaSession2: Change MediaPlayerBase to MediaPlayerInterface
...
Test: Run all MediaComponents tests once
Bug: 72527150
Change-Id: Ifd384ea274ec949caa767210b07e558844552077
2018-01-26 13:28:27 +09:00
TreeHugger Robot
9add1b8c1b
Merge "Revert "Fix issue #72116995 : Add permission guarding Service#startForeground""
2018-01-26 04:05:31 +00:00
Hyundo Moon
46377a9aae
VideoView2: Add custom actions API
...
Test: Using VideoViewTest application
Change-Id: I941bf0f9605918b0e0f9e4684327eee9ffe24e11
2018-01-26 12:58:55 +09:00
Florina Muntenescu
8ec69a628b
Merge "Making QuoteSpan more flexible."
2018-01-26 03:19:11 +00:00
Florina Muntenescu
ea27314e38
Merge "Update JavaDocs for Alignment, Clickable, Editable and MetricAffecting spans."
2018-01-26 03:18:46 +00:00
Insun Kang
df0728c15a
VideoView2: Apply API review comment
...
- Lint error: setVideoURI --> setVideoUri
- Adds 'View' parameter to the listener methods
- Adds missing documents for constants
- Removes getAudioSessionId()
- Typos
Test: build
Change-Id: I217c7608a8b9fed4111d0c928a270784307bf378
2018-01-26 11:23:04 +09:00
Ruchi Kandoi
05d7bebe23
Merge "Open Mobile API for frameworks/base" am: 183865f3e1 am: ab8328c047
...
am: 2729909ab6
2018-01-26 01:43:05 +00:00
Adam Lesinski
f7d01dd7e1
Revert "Replace AssetManager with AssetManager2 implementation"
...
This reverts commit dcb3c6559b
2018-01-25 17:39:40 -08:00
Ruchi Kandoi
2729909ab6
Merge "Open Mobile API for frameworks/base" am: 183865f3e1
...
am: ab8328c047
2018-01-26 01:18:49 +00:00
Ruchi Kandoi
ab8328c047
Merge "Open Mobile API for frameworks/base"
...
am: 183865f3e1
2018-01-26 01:13:45 +00:00
Bryce Lee
c91d86152a
Merge "Perform Activity#onStart when launching in LocalActivityManager."
2018-01-26 01:11:56 +00:00
Bryce Lee
886e7fed9e
Perform Activity#onStart when launching in LocalActivityManager.
...
We move to the start state when launching a tabbed activity through
LocalActivityManager, but currently do not inform the activity
thread due to changes in how ActivityThread is updated through the
ActivityLifecycler. This changelist addresses this issue.
Change-Id: Ibc2bda39617e1741bb3ee8637a182dc9f14dd61d
Fixes: 70813462
Fixes: 70812753
Test: atest CtsAppTestCases:android.app.cts.LifecycleTest
Test: atest LocalActivityManagerTest
Test: atest ActivityGroupTest
2018-01-25 17:10:28 -08:00
TreeHugger Robot
ce6b2d6bb9
Merge changes from topic "product_partition"
...
* changes:
Read media files from /product/media/audio
Support /product partition
2018-01-26 01:10:16 +00:00
Winson Chung
66f0026f3f
Merge changes from topics "reland_recents_animation", " reland_recents_animation"
...
* changes:
Fix issue with reparenting stacks on displays.
Revert "Revert "4/ Update SysUI shared lib for Recents transition""
Revert "Revert "3/ Add input consumer to capture touches during a Recents transition""
Revert "Revert "2/ Add support for remote Recents animation""
Revert "Revert "1/ Create display content window controller to position stacks in the display""
2018-01-26 00:46:34 +00:00
Winson Chung
41234f6248
Merge "Add feature check before entering PIP."
2018-01-26 00:16:14 +00:00
Android Build Merger (Role)
93b425185f
Merge "Merge "Show a warning toast/dialog when an app uses hidden APIs" am: fbef950d95 am: d750a7c68c am: 61c4d63c98"
2018-01-26 00:09:32 +00:00
TreeHugger Robot
0193e5651f
Merge "Add setting to control vibration intensity."
2018-01-26 00:09:09 +00:00
David Brazdil
f416008101
Merge "Show a warning toast/dialog when an app uses hidden APIs" am: fbef950d95 am: d750a7c68c
...
am: 61c4d63c98
2018-01-26 00:07:33 +00:00
Tarandeep Singh
20c7cf950d
Merge "Make IMS.setBackDisposition() work."
2018-01-25 23:57:34 +00:00
Bookatz
1a1b0464cb
Statsd and frameworks reference proto enums
...
For frameworks constants that don't have intrinsic meaning (i.e. their actual
value and order don't matter), so that it is unlikely that their values
will be changed:
This cl introduces proto enums representing some constants found in
the Android codebase, and connects the two.
By using the Proto enum as the source-of-truth, it means that Java and
proto can be kept in sync. Otherwise, when the Java frameworks code
changes, it silently breaks the protos from working properly, since the enums
are wrong. By having the Java code reference the proto enums, it ensures
that everything is in sync. The values of the constants are unchanged.
But future changes to these constants will need to be done in the proto
file, which the Java file merely references.
The protos are necessary for incidentd and statsd and, in the future,
possibly dumpsys. In this way, the logging mechanism is much less likely
to get broken when new constants are added, and we can be ensured that
the logging accurately reflects the underlying codebase.
Bug: 69478930
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases
Change-Id: If79032c34b2799db1e3e70cb47b1312fd72092b9
2018-01-25 15:47:57 -08:00
Ruchi Kandoi
183865f3e1
Merge "Open Mobile API for frameworks/base"
2018-01-25 23:30:50 +00:00
Android Build Merger (Role)
c7810244db
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d am: 5ba62a2194" into oc-mr1-dev-plus-aosp
...
am: 0bde9c4355
2018-01-25 23:22:31 +00:00
Android Build Merger (Role)
a6216a86f0
Merge "Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp am: 954ba2c6a1"
2018-01-25 23:06:23 +00:00
Android Build Merger (Role)
6b3dd70b1f
Merge "Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98 am: ebc0afd811" into oc-mr1-dev-plus-aosp
...
am: 954ba2c6a1
2018-01-25 23:03:11 +00:00
TreeHugger Robot
854211d15b
Merge "Store WebView package signatures as Signatures instead of Strings"
2018-01-25 22:58:49 +00:00
TreeHugger Robot
5815664d4b
Merge "Add AbstractThreadedSyncAdapter#onUnsyncableAccount API"
2018-01-25 22:47:54 +00:00
David Brazdil
61c4d63c98
Merge "Show a warning toast/dialog when an app uses hidden APIs" am: fbef950d95
...
am: d750a7c68c
2018-01-25 22:32:28 +00:00
Winson Chung
80fa2d88b4
Add feature check before entering PIP.
...
Bug: 72063615
Test: ActivityManagerPinnedStackTests
Change-Id: I4bed3a39c28c62121db47b8a61dda2516e41d245
2018-01-25 14:26:48 -08:00
Matthew Fritze
9bc0572151
Merge "Add Setting Slices Contract file"
2018-01-25 22:25:54 +00:00
TreeHugger Robot
b93b797199
Merge "Update to the ActivityManager proto"
2018-01-25 22:21:30 +00:00
Hugo Benichi
65bbfa1c6c
Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d
...
am: 5ba62a2194
2018-01-25 22:19:53 +00:00
Andreas Gampe
d6e151c469
Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98
...
am: ebc0afd811
2018-01-25 22:10:27 +00:00
David Brazdil
d750a7c68c
Merge "Show a warning toast/dialog when an app uses hidden APIs"
...
am: fbef950d95
2018-01-25 22:01:49 +00:00
Hugo Benichi
5ba62a2194
Merge "Tcp socket metrics: implement INetdEventListener callback"
...
am: 93b1787a3d
2018-01-25 21:55:08 +00:00
TreeHugger Robot
ae30c68489
Merge "VideoView2: Remove APIs supported by MediaSession"
2018-01-25 21:53:12 +00:00
Andreas Gampe
ebc0afd811
Merge "ActivityManager: Add support for agents on startup"
...
am: d5cba89b98
2018-01-25 21:50:42 +00:00
Winson Chung
a89ffedaa3
Revert "Revert "3/ Add input consumer to capture touches during a Recents transition""
...
This reverts commit 86733be8f6
2018-01-25 13:44:44 -08:00
Winson Chung
e2d721781f
Revert "Revert "2/ Add support for remote Recents animation""
...
This reverts commit 9f8518e532
2018-01-25 13:44:44 -08:00
TreeHugger Robot
15dc9d7ddd
Merge "Internal Framework changes needed by DocumentUI's ScopedAccessProvider:"
2018-01-25 21:30:22 +00:00
David Brazdil
fbef950d95
Merge "Show a warning toast/dialog when an app uses hidden APIs"
2018-01-25 19:53:13 +00:00
Treehugger Robot
93b1787a3d
Merge "Tcp socket metrics: implement INetdEventListener callback"
2018-01-25 19:23:18 +00:00
Calin Juravle
172814085b
Merge "Extend the ArtManager profiling API to cover boot image profiling"
2018-01-25 19:10:23 +00:00
