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
Ruchi Kandoi
05d7bebe23
Merge "Open Mobile API for frameworks/base" am: 183865f3e1 am: ab8328c047
...
am: 2729909ab6
Change-Id: Iee488feed404819e487f3ae87b3e71f531fe69a4
2018-01-26 01:43:05 +00:00
Ruchi Kandoi
2729909ab6
Merge "Open Mobile API for frameworks/base" am: 183865f3e1
...
am: ab8328c047
Change-Id: I55279ea7f83de285df54f7a01257230268c253f0
2018-01-26 01:18:49 +00:00
Ruchi Kandoi
ab8328c047
Merge "Open Mobile API for frameworks/base"
...
am: 183865f3e1
Change-Id: I96804d1c8e75a6d9d1475438a1753f54e07d0b8a
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
Change-Id: If75eacd24b072e382042885e20434b184dc91426
2018-01-26 00:07:33 +00:00
Tarandeep Singh
20c7cf950d
Merge "Make IMS.setBackDisposition() work."
2018-01-25 23:57:34 +00: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
Change-Id: Id17724faabe77fb7eaad7d3a7e009fb57f0d23d0
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
Change-Id: I218eb054ef0da896c72674c597249c6a5120500d
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
Change-Id: I9b62537d76e4ceb7ce03ca4de5ccf5a182c4439c
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
Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f
2018-01-25 22:19:53 +00:00
Andreas Gampe
d6e151c469
Merge "ActivityManager: Add support for agents on startup" am: d5cba89b98
...
am: ebc0afd811
Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
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
Change-Id: Icab7166bf83d2920c8d3f22774eafa4aea9fdaa4
2018-01-25 22:01:49 +00:00
Hugo Benichi
5ba62a2194
Merge "Tcp socket metrics: implement INetdEventListener callback"
...
am: 93b1787a3d
Change-Id: Ife421f2612b0bfc2d6be5c6d174d24abd4d2e2fb
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
Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
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 .
Reason for revert: Testing relanding changes with ag/3515280
Change-Id: I37172d809db48622040d5fa41c4d4dcd077a9328
2018-01-25 13:44:44 -08:00
Winson Chung
e2d721781f
Revert "Revert "2/ Add support for remote Recents animation""
...
This reverts commit 9f8518e532 .
Reason for revert: Testing relanding changes with ag/3515280
Change-Id: I410bd752c815a5b998a719453def01e00a9d47c8
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
Felipe Leme
23a0c7a009
Internal Framework changes needed by DocumentUI's ScopedAccessProvider:
...
- Changed AM.getGrantedUriPermissions() API.
- Made DocumentsContract.PATH_TREE public.
Also fixed related AM methods to use explicit for on some loops.
Bug: 63720392
Test: manual verification
Change-Id: I33bdcb949f4301534bd8467c8018d6f03b4588a4
2018-01-25 11:04:29 -08:00
Calin Juravle
2b6e24c7e5
Merge "[framework] Extend profile operations to take the profile name"
2018-01-25 18:58:09 +00:00
TreeHugger Robot
15050aaa99
Merge "Statsd broadcasts when it is alive"
2018-01-25 18:55:45 +00:00
TreeHugger Robot
e2975162dc
Merge "Adding intent generation for dates and flights"
2018-01-25 18:28:25 +00:00
Treehugger Robot
d5cba89b98
Merge "ActivityManager: Add support for agents on startup"
2018-01-25 18:08:07 +00:00
Artem Iglikov
0edd645492
Merge "Revert "Make idiomatic use of ApkAssets and AssetManager""
2018-01-25 18:06:49 +00:00
TreeHugger Robot
48726eae32
Merge "Remove unused system api Window.setDisableWallpaperTouchEvents"
2018-01-25 18:05:15 +00:00
Ruchi Kandoi
a1f9401a22
Open Mobile API for frameworks/base
...
This contribution is an implementation of the GlobalPlatform
Open Mobile API for Android with some modifications to
namespaces and packages to make it suitable as a core
Android component.
This contribution is based on
0001-Open-Source-Contribution-of-Smartcard-Service-for-fr.patch
which can be found in
https://portland.source.codeaurora.org/patches/quic/la/PATCH_217881_OpenMobileAPI_20171206.tar.gz
The submitted patch was derived from
https://source.codeaurora.org/quic/la/platform/packages/apps/SmartCardService/commit/?h=LA.BF64.1.2.1&id=06ecea9abb8264049f52c7e31c0bc13330a425d5 .
Test: Sample Application; open Channels and transmit APDUs
Change-Id: Iac5206bd84798ca0fcdb504c89e1da5383012a5a
Signed-off-by: Jeremy O'Donoghue <jodonogh@codeaurora.org >
2018-01-25 18:04:17 +00:00
TreeHugger Robot
50bdbe3e2f
Merge "Add key to store location changer"
2018-01-25 17:59:24 +00:00
TreeHugger Robot
f1b720c488
Merge "Skip priv app full apk verification if has verify"
2018-01-25 17:52:25 +00:00
TreeHugger Robot
c86a420c6e
Merge "Finish broadcast radio HAL 2.0 radio service."
2018-01-25 17:49:26 +00:00
TreeHugger Robot
4dadff8be0
Merge "Add confirmation UI protocol to Keystore AIDL definition"
2018-01-25 17:31:38 +00:00
TreeHugger Robot
7f1e49f2ff
Merge "Generating StrongBox backed keys"
2018-01-25 17:24:17 +00:00
TreeHugger Robot
3bcddc94ac
Merge "Chained attribution for GnssLocationProvider."
2018-01-25 17:14:11 +00:00