Brad Ebinger
7001684120
[automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698ac am: b7b81db6e0 -s ours am: d678eef58e -s ours
...
am skip reason: Change-Id I3250419a2438afb58922ae653e3f2e4f9628e593 with SHA-1 ffb93e5dd6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344876
Change-Id: Ia4e1bdf06aebe045f813762da2780098b93dd269
2020-06-19 19:40:57 +00:00
Kevin Chyn
b14a5631c1
Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 2738860066
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665
Change-Id: Ieb2cc275f0a1b963dbad81aee16ca5e81b00b9cc
2020-06-19 19:40:47 +00:00
Kevin Chyn
00c670218a
Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 2738860066
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665
Change-Id: Id89c1758c32cb58e8a12399a522841b31467f98f
2020-06-19 19:40:25 +00:00
Nathan Harold
2abfd76433
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: 86013d505f am: f543091ab8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: Ice691d4d12e83201be39fde82e8991a2bd3758c9
2020-06-19 19:32:01 +00:00
Kevin Chyn
4eff386e19
Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665
Change-Id: Ia79d0404405cb0399f86427722af38a24605bc65
2020-06-19 19:26:30 +00:00
Kevin Chyn
2738860066
Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665
Change-Id: I3ad2e1a55d61fe1f728aec688a81552ad129f9b5
2020-06-19 19:26:19 +00:00
Joshua Tsuji
494fdeaf6e
When opening from locked shade, wait for the shade to unlock before expanding.
...
Bug: 159270619
Test: open notifs from a locked shade!
Change-Id: Ibc8312895c4e4321b6a98b60a24ab7c13662e239
2020-06-19 15:26:18 -04:00
Matt Pietal
2f63cc02b7
Controls UI - Marquee + transient status == no good
...
Temporary text was not given enough time to be visible, and could
cause confusion. Remove all temporary text in favor of leaving it
until the app decides to update, or the user takes another action.
Fixes: 159163559
Test: manual, controls mock + large font, touch on TYPE_TV
Change-Id: I6093c450e286cd1aac489847180877d78faa7ed3
2020-06-19 15:23:40 -04:00
Nathan Harold
b5f4fa15bb
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: 86013d505f am: eb33819b65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: Ic10b0cae03e9d147c0e8c4479583e80c09248a73
2020-06-19 19:23:34 +00:00
Nathan Harold
5c077660b2
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: c1197612dd am: a7c90af06a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: Ic7c94349a1b1b4ba959d5a0ecdcab5a82b43514d
2020-06-19 19:23:16 +00:00
Brad Ebinger
f02640c92c
[automerger skipped] Merge "Fix UCE docs" am: 5c91f871d7 am: 032022c6c2 -s ours am: f01e35e7a0 -s ours am: 8d27e409bc -s ours
...
am skip reason: Change-Id I01617d0741055e347e05bdbd5eb5a6825f896e73 with SHA-1 1735254a44 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344878
Change-Id: I06db7dbb75f17f050bf6a45a350891277a0b83b0
2020-06-19 19:23:09 +00:00
Ned Burns
0934dc1192
Log when users/profiles change
...
This is in the new pipeline, but it should apply for both pipelines.
Bug: 148390204
Test: manual
Change-Id: I780b6cb6174d759e978c52ab49bb42f28eda315c
2020-06-19 15:23:08 -04:00
Khaled Abdelmohsen
ff01ee5f51
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: b629527d92 am: e7c38f3412
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: Ic29ba22d5c5a5630f4a320bc3c30101a07fcfbed
2020-06-19 19:22:42 +00:00
Brad Ebinger
d678eef58e
[automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698ac am: b7b81db6e0 -s ours
...
am skip reason: Change-Id I3250419a2438afb58922ae653e3f2e4f9628e593 with SHA-1 ffb93e5dd6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344876
Change-Id: I2f84af4d2d958b4f144ed5725ea5ebcccc1384d7
2020-06-19 19:22:22 +00:00
Nathan Harold
eb33819b65
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: 86013d505f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: I74a98bffe6caf4d07d520942141b638295679438
2020-06-19 19:17:13 +00:00
Nathan Harold
f543091ab8
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: 86013d505f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: Id715cf6426d157e3fc1bd036dead615afb3832e3
2020-06-19 19:17:05 +00:00
Kevin Chyn
5731877f1e
Merge changes from topic "b/159260556" into rvc-dev
...
* changes:
Revert "Do not start biometric auth if encrypted or lockdown"
Revert "Add SafetyNet logging for b/79776455"
2020-06-19 19:12:47 +00:00
Nathan Harold
a7c90af06a
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5 am: c1197612dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: I3949c558411509ac1ab1d734f4d7b3e94446ce30
2020-06-19 19:07:00 +00:00
Brad Ebinger
8d27e409bc
[automerger skipped] Merge "Fix UCE docs" am: 5c91f871d7 am: 032022c6c2 -s ours am: f01e35e7a0 -s ours
...
am skip reason: Change-Id I01617d0741055e347e05bdbd5eb5a6825f896e73 with SHA-1 1735254a44 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344878
Change-Id: I923dbf53cc603cb4b31755d173d50c3ca7cd0feb
2020-06-19 19:06:54 +00:00
Brad Ebinger
b7b81db6e0
Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344876
Change-Id: I41cf8852c35ee1c37597c922892e63475e6af04a
2020-06-19 19:06:09 +00:00
Khaled Abdelmohsen
e7c38f3412
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: b629527d92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: Ib4b1586965faa9831d2690c8e50b5512c1a4e5b3
2020-06-19 19:06:04 +00:00
Nathan Harold
c1197612dd
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: Ic22846e6f3337b2ebe7a6448829616a8a29056b3
2020-06-19 19:05:29 +00:00
Nathan Harold
86013d505f
Merge "Allow Background Location Access for Shell" into rvc-dev am: 811cf5d8f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914608
Change-Id: I682f5d337a6c41fe9b48103d0844d483d496ac49
2020-06-19 19:05:15 +00:00
Winson Chung
a10139c9a9
Fix issue with
...
- For R, resizing is from an input consumer which is receiving touches
globally, for now, just ignore resizing when we know there is
occluding sysui visible
Change-Id: I56a442a6335cd2367606356c67efbefdadc897fc
Bug: 158887398
Test: Open pip, open shade/bubbles/power menu and try to resize where
the pip would be (ensure that we don't and that it doesn't
steal touches from other sysui)
2020-06-19 11:54:20 -07:00
Khaled Abdelmohsen
ce52d02650
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1 am: 4152c93325
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: I502df8f27da3f3e27af4378d2eaac008683961a1
2020-06-19 18:50:05 +00:00
Govinda Wasserman
e5cbd5ec74
Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 9fa201e0a4 am: e5a12649a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643
Change-Id: I780fece36e42d08147714b716559e69c7db7c581
2020-06-19 18:49:52 +00:00
Ben Lin
1811dacd8e
Merge "Disable drag handle." into rvc-dev am: 79554c081d am: a4c6c33df2 am: e3f7c5d5f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128
Change-Id: Id3f1c8a8c3545996bc2f1f4513b388c938522dc5
2020-06-19 18:49:36 +00:00
Govinda Wasserman
b0d67f8d86
Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 47266510d1 am: c7f7f57bb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643
Change-Id: I09ae4ec0c000152690a738681f2d0b16fbf4bbf6
2020-06-19 18:49:25 +00:00
Ben Lin
41317c9bca
Merge "Disable drag handle." into rvc-dev am: 79554c081d am: 80d9344e16 am: c444d8f8ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128
Change-Id: I4b82f23ddbc05883d44727a37f578384235a4263
2020-06-19 18:49:07 +00:00
Miranda Kephart
6ddb902744
Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 5e93c737e7 am: 7945165934
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617
Change-Id: Ie2830e1543d1b87f1ed6eb6ad8b0c6d427f7fb02
2020-06-19 18:48:57 +00:00
Automerger Merge Worker
c142cd8735
Merge "Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 8d692863f6" into rvc-d1-dev-plus-aosp am: 6aeba0e43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617
Change-Id: Ie967f0243a50323e6646013e1de312ab5885605a
2020-06-19 18:48:45 +00:00
Brad Ebinger
f01e35e7a0
[automerger skipped] Merge "Fix UCE docs" am: 5c91f871d7 am: 032022c6c2 -s ours
...
am skip reason: Change-Id I01617d0741055e347e05bdbd5eb5a6825f896e73 with SHA-1 1735254a44 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344878
Change-Id: If95f728c5aa216a6ebd090a29488eea84aacc949
2020-06-19 18:48:38 +00:00
Stanislav Zholnin
456b496e4a
Save AsyncOps for later forwarding instead of SyncOps.
...
Fixes: 159082266
Test: atest AppOpsLoggingTest
Change-Id: I3f8da9d7c2925233e5e53cfa7fd5e4cd1c258b29
2020-06-19 19:48:35 +01:00
TreeHugger Robot
9f46db1561
Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 71c03aa64d am: cfbac9d5d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679
Change-Id: I34b1c6933cd1ece32f44e16472ef4a0a90557f42
2020-06-19 18:48:31 +00:00
TreeHugger Robot
329bbfb007
Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 6f3b411b21 am: 7754e0a544
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679
Change-Id: I282677c0ea6f1f96c7ae26f95bd195a4c9b8edd8
2020-06-19 18:48:14 +00:00
Nathan Harold
811cf5d8f5
Merge "Allow Background Location Access for Shell" into rvc-dev
2020-06-19 18:48:07 +00:00
Brad Ebinger
e51d2698ac
Merge "Remove IllegalArgumentException for registration of capabilities"
2020-06-19 18:44:09 +00:00
Khaled Abdelmohsen
bab5d2ff0b
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1 am: 75f12a997a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: I43a9bbb813f56c2b3f90409dad44f1a913e515f1
2020-06-19 18:43:29 +00:00
Govinda Wasserman
f21407852a
Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 9fa201e0a4 am: 6ab8173a0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643
Change-Id: I6a77bb3c617e4db4673dba9e4ec168f2ef75e466
2020-06-19 18:43:20 +00:00
Alison Cichowlas
3d88dccf7c
When Nearby is present as a chip, exclude it from app list.
...
Fixes: 156514997
Test: atest ChooserActivityTest; manual with Nearby enabled
Change-Id: Ibfb1cd2b25d41e56aea7ecd861af78ae7b48898b
2020-06-19 14:43:16 -04:00
Ben Lin
de8766cb6b
Merge "Disable drag handle." into rvc-dev am: 79554c081d am: a4c6c33df2 am: 2e900db3e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885128
Change-Id: I395306bb160268f6442ef14a29e21c5d66ecf5eb
2020-06-19 18:43:09 +00:00
Stanislav Zholnin
54762b293e
Prevent developer provided strings from being uploaded through statsd.
...
- in situation when developer provides message when op is noted, do not
report it through stack trace collection infrastructure
- collect only statcktraces for OP_FLAG_SELF and OP_FLAG_TRUSTED_PROXIED to
match collection of appops counts
Test: atest android.app.appops.cts.RuntimeMessageCollectionTest
Fixes: 159433071
Change-Id: I1ab56a530832873a1f1f68aba5ab6eabc9e8a17a
2020-06-19 19:43:03 +01:00
Miranda Kephart
21c6e87048
Merge "Close screenshot UI on CLOSE_SYSTEM_DIALOGS intent" into rvc-dev am: 703aaba6c6 am: 8d692863f6 am: 985d1a6b37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908617
Change-Id: Ie4b9aa402d27c42679ae669d1099e00273382d32
2020-06-19 18:42:58 +00:00
Khaled Abdelmohsen
75f12a997a
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: I6fa0e7bae16d86758df3a795b4d2ac2ffcfbccf4
2020-06-19 18:42:57 +00:00
Khaled Abdelmohsen
4152c93325
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b am: 6413ab89b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: I7ebea6d35e6f158166fa227fe1151fe7817de644
2020-06-19 18:42:56 +00:00
Govinda Wasserman
6ab8173a0d
Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 9fa201e0a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643
Change-Id: I6557903a9735dd22ed40828cc2ddadbca1467232
2020-06-19 18:42:47 +00:00
Govinda Wasserman
e5a12649a6
Merge "Generify arguments to AssistLogger" into rvc-dev am: 6650cd46aa am: 9fa201e0a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11930643
Change-Id: Iae25e99a58a2d2e9cc82e60c6f6f6f22fc4bee2f
2020-06-19 18:42:45 +00:00
TreeHugger Robot
80a77c454b
Merge "Allow exposing ChunkIndex as MediaFormat" into rvc-dev am: e9db363b54 am: 6f3b411b21 am: 5ca8855b7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11808679
Change-Id: Ie337355a077171166027877b0ebfa1a8fecb7f7c
2020-06-19 18:42:40 +00:00
Khaled Abdelmohsen
b629527d92
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: Ie6ece79118a75ffac46e4d665844717cb6ba9c57
2020-06-19 18:42:36 +00:00
Khaled Abdelmohsen
6413ab89b1
Merge "Modify source stamp format" into rvc-dev am: 592da34c0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837613
Change-Id: I00ea1bf13bb737e46598ed90cdc54e7dc8433194
2020-06-19 18:37:59 +00:00