Lucas Dupin
|
bfa47e32f0
|
Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f792c am: e03e835164 am: 16b12b3130
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887440
Change-Id: I2482af1d80a90c0ba9b8e8c75702c78a537024c1
|
2020-06-18 14:53:35 +00:00 |
|
Lucas Dupin
|
2511aa24fa
|
Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 0c6e01702b am: 009e4aba0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820
Change-Id: I56c5fc463a04fa5013821413b373445756728158
|
2020-06-18 14:53:24 +00:00 |
|
Tingting Wang
|
2a9f2b5fea
|
Merge "Add CP2 general usage counters to westworld logs." into rvc-dev am: 6d4e262aa8 am: 5454e69665 am: 305653a548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855701
Change-Id: I5a10bcc6d204b6bb2ec669f89b7bbda161e2cf2c
|
2020-06-18 14:53:13 +00:00 |
|
Nikita Dubrovsky
|
f868a3c0b8
|
Merge "Dataset authentication for Augmented Autofill" into rvc-dev am: 74c6b2a668 am: 56055f7dd0 am: e4f55d5bb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825429
Change-Id: I1d69fe871e719079e16e4cdf2dd8a5576e100fa9
|
2020-06-18 14:52:50 +00:00 |
|
Tony Huang
|
384db6a1e7
|
Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43 am: fb8f2ae018 am: cf30740d82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785
Change-Id: If78def250d4a9f06748c27cf0c780d9c1b3ccfea
|
2020-06-18 14:52:15 +00:00 |
|
Mark Chien
|
2dedd82556
|
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 4e8de47ed1 am: 2c93987411
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: I23617848f76bcc5d23a4ac63dc023a44af1fa68e
|
2020-06-18 14:52:01 +00:00 |
|
Kevin Chyn
|
33be410be5
|
Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: f1f2fa9e04 am: 1edd6b1a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678
Change-Id: I07ced9f30bb6016939e2b3e3527f2b0bff82e229
|
2020-06-18 14:51:46 +00:00 |
|
Josh Tsuji
|
225951afcb
|
Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: 26e26c5e9f am: 30f4bb8018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049
Change-Id: I97bf563f49c13193c02b05e752d3e6843ab9a395
|
2020-06-18 14:51:34 +00:00 |
|
Hayden Gomes
|
fca98b09af
|
Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: ecea6e9950 am: 636b31307d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112
Change-Id: Id57c433efacf2be530765563ee8986bc8f28287b
|
2020-06-18 14:51:08 +00:00 |
|
Automerger Merge Worker
|
6e20d35d0c
|
Merge changes from topic "am-a26004ccc842412893a03c64ea53ff62" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: c03bbfcb7f am: 4f775645d5
[automerger skipped] Pre-cache filter results am: 0192f737ff am: e518db7cd3 -s ours am: 7be93517cf -s ours
|
2020-06-18 14:49:59 +00:00 |
|
TreeHugger Robot
|
648e737105
|
Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: c03bbfcb7f am: 4f775645d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117
Change-Id: I31ff2521249e803d8c58214e724c8a0b682ecb0a
|
2020-06-18 14:49:53 +00:00 |
|
Patrick Baumann
|
dc825632bd
|
[automerger skipped] Pre-cache filter results am: 0192f737ff am: e518db7cd3 -s ours am: 7be93517cf -s ours
am skip reason: Change-Id I6e0446068f46af0f22e0259ab7b6cdbbc7e08a22 with SHA-1 0192f737ff is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817533
Change-Id: Iaff68d3f1ebdeb7264b6d0fccf098bd1f48d8071
|
2020-06-18 14:49:50 +00:00 |
|
Hai Zhang
|
78428e8ab1
|
Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: a4b75fcbf4 am: 592485ea49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635
Change-Id: I002a033fee912dc639d8e4e3bbe630948467fa32
|
2020-06-18 14:49:43 +00:00 |
|
Automerger Merge Worker
|
82f2cc8c0f
|
Merge "Merge "Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a589e am: f91005b430" into rvc-d1-dev-plus-aosp am: b4d79832d2" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:49:39 +00:00 |
|
Automerger Merge Worker
|
4da82062dc
|
Merge "Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a589e am: f91005b430" into rvc-d1-dev-plus-aosp am: b4d79832d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11796856
Change-Id: I1677586b390057bb17eecf35ab98eab68a1aac87
|
2020-06-18 14:49:33 +00:00 |
|
TreeHugger Robot
|
8491c58e1d
|
Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 am: 63a3be6b5f am: 5d9b2f3990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759
Change-Id: I3105ca0fde3b7f2fee3204a686afd007c50f17fc
|
2020-06-18 14:49:31 +00:00 |
|
Automerger Merge Worker
|
1c5e384a74
|
Merge "Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6 am: 9d9b74e012" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:49:26 +00:00 |
|
TreeHugger Robot
|
796b059695
|
Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6 am: 9d9b74e012
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859
Change-Id: I26149de6ab48b4f55079d5155676ef9a82096553
|
2020-06-18 14:49:18 +00:00 |
|
Automerger Merge Worker
|
92be959d7d
|
Merge "Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b am: 64bba6ab51" into rvc-d1-dev-plus-aosp am: b23c28a1a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881940
Change-Id: Ic0a778b12386e1c80cec410b06ca3b7a36395656
|
2020-06-18 14:49:16 +00:00 |
|
TreeHugger Robot
|
aeb06b6a5c
|
Merge "Revert "Disable user animations on insets whose visible frame is empty"" into rvc-dev am: 11fcb1987a am: f79e0b0cb4 am: 14d852adc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883882
Change-Id: I10e7c3ffdcfb9c8134c1e4947e2a614b0218907d
|
2020-06-18 14:49:05 +00:00 |
|
Automerger Merge Worker
|
a423c35d43
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 02f853ebe6 -s ours am: 5a10dc9fb4 -s ours am: c3356f00a9 -s ours" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:49:00 +00:00 |
|
TreeHugger Robot
|
537f03718a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 02f853ebe6 -s ours am: 5a10dc9fb4 -s ours am: c3356f00a9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842829
Change-Id: I872ebe2718686686061aa98defb3d1c7d9cef336
|
2020-06-18 14:48:54 +00:00 |
|
Automerger Merge Worker
|
4bebb60036
|
Merge "Merge "Allow finish resize transaction to be overriden" into rvc-dev am: 62a69b9632 am: b0ddde39d9" into rvc-d1-dev-plus-aosp am: 25e7ac7c84
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838962
Change-Id: Ibe8f49691654644ce8d218ae5c9837fcbe2d00ae
|
2020-06-18 14:48:52 +00:00 |
|
TreeHugger Robot
|
a54a61812a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 384982ef62 -s ours am: 13034814ba -s ours am: f1d9539cb6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872630
Change-Id: I990afc62fb9bf38f4da4dc8ef8fa9195e4f232bc
|
2020-06-18 14:48:44 +00:00 |
|
Automerger Merge Worker
|
dafbc87b1d
|
Merge "Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 am: 2ef3210f10" into rvc-d1-dev-plus-aosp am: 7fb988c893
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887489
Change-Id: I4846bab5eb7baf8c370ca9b3bbe15da852aa7d72
|
2020-06-18 14:48:20 +00:00 |
|
TreeHugger Robot
|
79c61da8c9
|
Merge "WifiManager: Fix javadoc in addNetworkSuggestions" into rvc-dev am: fe471bb73a am: cbb913f587 am: 441d5b6ebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883075
Change-Id: I7402c691be8a0640be0f4aab8ff8b40e7a4f8de9
|
2020-06-18 14:48:06 +00:00 |
|
Lucas Dupin
|
bfb7c15ce1
|
Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f792c am: e03e835164 am: 7169318522
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887440
Change-Id: I006fb4161919d19d9ac89ba45e49c8d3b96c8063
|
2020-06-18 14:47:53 +00:00 |
|
Lucas Dupin
|
f9535d04b6
|
Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 0c6e01702b am: 04b40cf229
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820
Change-Id: I5c9ac6957356b21bcb3c26d7679608d788adc3ce
|
2020-06-18 14:47:36 +00:00 |
|
Automerger Merge Worker
|
ea42d01b3b
|
Merge "Merge "Fix input method switch handling in autofill" into rvc-dev am: e710511e85 am: 324f4e0429 am: 1c222686b4" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:47:35 +00:00 |
|
Feng Cao
|
e325ee4236
|
Merge "Fix input method switch handling in autofill" into rvc-dev am: e710511e85 am: 324f4e0429 am: 1c222686b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855410
Change-Id: I77ee3ac942aea59f8091a9ddd4229c26c0949595
|
2020-06-18 14:47:27 +00:00 |
|
Tingting Wang
|
9551a5bef1
|
Merge "Add CP2 general usage counters to westworld logs." into rvc-dev am: 6d4e262aa8 am: 5454e69665 am: 6ca57b8f6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855701
Change-Id: I40abc5154ba6331a2bdaf5e02b192899ed01e9ec
|
2020-06-18 14:47:26 +00:00 |
|
Nikita Dubrovsky
|
7db9571ec7
|
Merge "Dataset authentication for Augmented Autofill" into rvc-dev am: 74c6b2a668 am: 56055f7dd0 am: fa8c0e3cd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825429
Change-Id: Id86682e90bb0987ce3fbf7b0907c28f42ef2ceb0
|
2020-06-18 14:47:03 +00:00 |
|
Tony Huang
|
fbc5e81cb9
|
Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43 am: fb8f2ae018 am: 254dfa947b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785
Change-Id: I151f45eb7f417ee0d7040d4986ddc9fa1eabd549
|
2020-06-18 14:46:53 +00:00 |
|
Automerger Merge Worker
|
f02bfb57ce
|
Merge "Merge "Make view intent immutable" into rvc-dev am: 80bf9c825a am: ed7a25fe40 am: c59f54ab2a" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:46:51 +00:00 |
|
Beth Thibodeau
|
64caabf92d
|
Merge "Make view intent immutable" into rvc-dev am: 80bf9c825a am: ed7a25fe40 am: c59f54ab2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869229
Change-Id: Ie74acdbdb5b79f6f68505a19770fa27d72e39eac
|
2020-06-18 14:46:44 +00:00 |
|
Mark Chien
|
70a25d4dce
|
Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 4e8de47ed1 am: 796582884e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076
Change-Id: If4aac5b57ca1a63d315e6ba5320f99acf88779ea
|
2020-06-18 14:46:31 +00:00 |
|
Automerger Merge Worker
|
34f130d1d7
|
Merge "Merge "Document ACTION_WEBVIEW_SETTINGS possible unavailability" into rvc-dev am: 3b915e51e1 am: 2b1382ca07 am: 2f2272f3c9" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:46:20 +00:00 |
|
Automerger Merge Worker
|
9519f5bc36
|
Merge "Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: f1f2fa9e04 am: 4c02bbf953" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:46:09 +00:00 |
|
TreeHugger Robot
|
4f03ce839d
|
Merge "Document ACTION_WEBVIEW_SETTINGS possible unavailability" into rvc-dev am: 3b915e51e1 am: 2b1382ca07 am: 2f2272f3c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602072
Change-Id: I48888db09efaac95e406a19aedcb096040ea7b9e
|
2020-06-18 14:46:04 +00:00 |
|
Kevin Chyn
|
ddcf9b447d
|
Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: f1f2fa9e04 am: 4c02bbf953
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678
Change-Id: I2eec2f13a06dc18a8d280a010820e082115ab899
|
2020-06-18 14:45:56 +00:00 |
|
Nikita Ioffe
|
4b06227a0e
|
Merge "Start OP_NO_ISOLATED_STORAGE on am instrument --no-isolated-storage" into rvc-dev am: 663727472a am: daf5ff9053 am: f3d620b58e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798518
Change-Id: I7e8bffebd7bb7ebe1a7cd0049bad09aa45a342d1
|
2020-06-18 14:45:46 +00:00 |
|
John Reck
|
3a5a7e10a6
|
Merge "Revert "Drop max texture cache size from 12x to 5x"" into rvc-dev am: 556fe0b9e5 am: 1b5d8a8b26 am: 148d57b968
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838959
Change-Id: Ife0399baf682c6435ceadead301702c0a0275978
|
2020-06-18 14:45:35 +00:00 |
|
TreeHugger Robot
|
4de4ee44a9
|
Merge "Implementation of sharding for procstats atoms" into rvc-dev am: 26dfdc587f am: 69a7a599ed am: bd856cf508
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859725
Change-Id: I95be82dceda5d0adba16de6daaff26a3353fb3e6
|
2020-06-18 14:45:24 +00:00 |
|
Automerger Merge Worker
|
0d56ba6d8e
|
Merge "Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: 26e26c5e9f am: 978833745a" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:45:23 +00:00 |
|
Yara Hassan
|
9b02ffd6e6
|
Add westworld logging for CCAPI data share am: faf50e11cb am: 74da01288d am: 0da160920c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818613
Change-Id: Ifd36242627f043f5d548b32a7f96c9f9a3603899
|
2020-06-18 14:45:14 +00:00 |
|
Josh Tsuji
|
f4f999359d
|
Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: 26e26c5e9f am: 978833745a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049
Change-Id: Ifd2ef7d680ecbbcce7c8e8fdb15e78b696ab9907
|
2020-06-18 14:45:13 +00:00 |
|
Ruslan Tkhakokhov
|
90a8a8cc64
|
Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb am: d39b0a73b7 am: a10bcc557d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867444
Change-Id: Id467fa3a7589eb8796845c1cf86ff0b0943901e4
|
2020-06-18 14:45:05 +00:00 |
|
Winson Chung
|
481eba45a0
|
Merge "Add additional tracing for nav button backgrounds" into rvc-dev am: e184e6c819 am: d302eb4fe2 am: 3bf6bb4330
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869885
Change-Id: If684750d1c1a35d1520304c83789b82f976ab5c1
|
2020-06-18 14:43:49 +00:00 |
|
Automerger Merge Worker
|
6edc4591fd
|
Merge "Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: ecea6e9950 am: 869d45d07d" into rvc-qpr-dev-plus-aosp
|
2020-06-18 14:43:45 +00:00 |
|
Matt Casey
|
183606aeaa
|
Merge "Dismiss screenshot UI on back gesture/button." into rvc-dev am: 50886ed9a2 am: d20f039ec7 am: 1af3accc24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875978
Change-Id: Ib4b0a2f33d6f3b128c1acb8ce2264fe8ff20215f
|
2020-06-18 14:43:37 +00:00 |
|