Beth Thibodeau
604e5b4e80
Merge "Reduce height of expanded media controls"
2021-07-29 15:57:50 +00:00
Winson Chiu
8dd93df88f
Merge "Swap Codegen OWNER"
2021-07-29 15:43:58 +00:00
Bryce Lee
b06528161b
Merge "Increase communal view size."
2021-07-29 15:41:20 +00:00
Matt Pietal
ecd54e97b0
Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9 am: 61a54046da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421
Change-Id: I49bbf44c53f7d0171798606dc57f49d46ff3d0bd
2021-07-29 15:09:58 +00:00
Matt Pietal
61a54046da
Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15409421
Change-Id: I5a9e69f43467bfa5ee8382430b13451a33cf5832
2021-07-29 14:51:36 +00:00
Matt Pietal
c3915dcbe9
Merge "Make sure SIM PIN screen shows" into sc-dev
2021-07-29 14:41:41 +00:00
Ioana Moraru
581ffc44fd
Merge "Move assertions for non-resizeable application"
2021-07-29 13:41:13 +00:00
Leon Scroggins
cedb3a5e00
Merge "IWYU : SkDeque will no longer be transitively included"
2021-07-29 13:23:56 +00:00
Beverly Tai
496b254d5e
Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b am: dfc125c362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658
Change-Id: I2a35bc883cbe055326afb5a979956ca821384847
2021-07-29 13:18:01 +00:00
Brian Osman
a9ded20012
IWYU : SkDeque will no longer be transitively included
...
Change-Id: I2650c44f774367c9c60c2e5aa6654292646b1412
2021-07-29 13:15:12 +00:00
Beverly Tai
dfc125c362
Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658
Change-Id: Ibc096a6cd1ed117241a5e7e56ff46d13f67b7508
2021-07-29 13:05:22 +00:00
Beverly Tai
35feb5c65f
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5 am: c02f464cff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657
Change-Id: I689ee94ca437227f2acc6bbd6726c81cea49ebea
2021-07-29 12:54:08 +00:00
Beverly Tai
866753754b
Merge "Rescan face when user preses empty space on LS" into sc-dev
2021-07-29 12:49:28 +00:00
Beverly Tai
c02f464cff
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev am: 11f74e42a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412657
Change-Id: If5916da0c0f7de7f665d1c4b9f5a81a85e7d8af1
2021-07-29 12:44:54 +00:00
Beverly Tai
11f74e42a5
Merge "Don't setDeviceEntryIntent on AOD" into sc-dev
2021-07-29 12:29:26 +00:00
Ioana Moraru
a2c1839bcd
Move assertions for non-resizeable application
...
Move the tests for non-resizeable application from postsubmit to
presubmit
Bug: 167521668
Test: atest FlickerTests:OpenAppNonResizeableTest
Change-Id: If25f813975204772734331ff5ae686eeb1aa9f4c
2021-07-29 10:40:47 +00:00
Chilun Huang
78064584ae
Merge "Remove flaky annotation" into sc-v2-dev am: 5eb2ccc35b am: 0095c4e065
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401414
Change-Id: I6c06e195600114c5c1eefe4de87e84fc8acf9e44
2021-07-29 09:27:04 +00:00
Fiona Campbell
7ec34d8cde
Merge "Null check for logicaldisplay" into sc-dev am: fca58882db am: 408cff1247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077
Change-Id: I852ac474bf4cb55234aa8b84a6413c0756a259d8
2021-07-29 09:23:23 +00:00
Jing Ji
2c5b0be41e
Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71 am: 000c176097
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738
Change-Id: I10dd0c0d3f33c586ac366d9896a478752102c86b
2021-07-29 09:22:43 +00:00
Chilun Huang
0095c4e065
Merge "Remove flaky annotation" into sc-v2-dev am: 5eb2ccc35b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401414
Change-Id: I990c2bc3f1c4df7c034b45a87a8b3d81815daa1e
2021-07-29 09:14:38 +00:00
Fiona Campbell
408cff1247
Merge "Null check for logicaldisplay" into sc-dev am: fca58882db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403077
Change-Id: I1bf201b3d9e0cec56c22388a0d2a2a4118fac524
2021-07-29 09:10:11 +00:00
Jing Ji
000c176097
Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404738
Change-Id: Icfd1297b5ce5188c5dfb0bcdd700babb2dc85b23
2021-07-29 09:09:49 +00:00
Fiona Campbell
fca58882db
Merge "Null check for logicaldisplay" into sc-dev
2021-07-29 08:39:31 +00:00
Chilun Huang
5eb2ccc35b
Merge "Remove flaky annotation" into sc-v2-dev
2021-07-29 08:36:46 +00:00
Jing Ji
8b872f5c71
Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev
2021-07-29 08:19:11 +00:00
TreeHugger Robot
dbe59006f8
[automerger skipped] Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be am: 25f312f493 -s ours
...
am skip reason: Merged-In Ifb37ac2a164a4564b74c6ab80a0c31fbba3495df with SHA-1 70fb3ee0f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901
Change-Id: Ic55db1c084b6b7358eaf33a9ff75a0e8579f4792
2021-07-29 07:19:57 +00:00
TreeHugger Robot
25f312f493
Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev am: fda724a5be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401901
Change-Id: Ie4bc1e12281d24220f756f6dba480f13f1273044
2021-07-29 07:10:14 +00:00
TreeHugger Robot
fda724a5be
Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev
2021-07-29 06:56:35 +00:00
Bryce Lee
1735a82738
Merge "Show dream as idle mode."
2021-07-29 06:53:25 +00:00
Shawn Lin
f26b64b961
Merge "Support display cutout for multi-display devices"
2021-07-29 06:47:45 +00:00
Chalard Jean
f704b05986
Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4 am: b029e44129
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698
Change-Id: I85dcb34a88200484bd66689f7a67e93161b86871
2021-07-29 06:18:25 +00:00
Chalard Jean
b029e44129
Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev am: 4e7b1128a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401698
Change-Id: I02f0deb8eb09b472ae71a3edc69738f4d4db9453
2021-07-29 06:05:10 +00:00
Chalard Jean
4e7b1128a4
Merge "Fix: ConnectivityManager methods crashing with SecurityException" into sc-dev
2021-07-29 05:55:06 +00:00
Riddle Hsu
14c899c8d7
Merge "Revert "Add interval for relayout perf test"" into sc-v2-dev am: d22fc3ee09 am: da5675050f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401464
Change-Id: I5f0345bdf2b2766353b06e7816958228de793b39
2021-07-29 04:37:31 +00:00
shawnlin
0a2167a063
Support display cutout for multi-display devices
...
- Add a new string array config that stores the unique id of each
display and when loading the cutout configs we first look up the index
of the unique id of the added display in the array and use this index
to load the corresponding cutout configs.
- Add new array configs for every cutout configs.
Bug: 186604541
Test: make, atest LocalDisplayAdapterTest
Test: check the device and see if the cutout is correctly set for each
display
Change-Id: I038832795c11cd16969caff5031fa1090493b008
2021-07-29 12:30:54 +08:00
Riddle Hsu
da5675050f
Merge "Revert "Add interval for relayout perf test"" into sc-v2-dev am: d22fc3ee09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401464
Change-Id: I0e254890f1e0e1827dabf4ea7aca5b62c0b42541
2021-07-29 04:26:12 +00:00
Riddle Hsu
d22fc3ee09
Merge "Revert "Add interval for relayout perf test"" into sc-v2-dev
2021-07-29 04:08:39 +00:00
Riddle Hsu
cc13d40599
Revert "Add interval for relayout perf test"
...
This reverts commit 9ba705609f .
Reason for revert: The metrics become unstable
Bug: 129527548
Change-Id: If1b9368eb55b124a8d66f06c82de193e4ddb9318
2021-07-29 04:08:27 +00:00
Chilun
da52a50220
Remove flaky annotation
...
The flakewas fixed by ag/15353756, so remove the annotation.
Bug: 194242735
Test: atest ActivityThreadTest
Change-Id: Ia6e3eda250a0b54a2027d16f6e51887c85ac8f95
2021-07-29 04:03:35 +00:00
Chalard Jean
d90d6457fb
Fix: ConnectivityManager methods crashing with SecurityException
...
Starting in R, some methods in ConnectivityManager like
getNetworkCapabilities started passing the package name from
the context stored in CM to check that the package is really
whom it pretends to be. Unfortunately, in some cases, the
context contains package "android" for an app, and since the
app is not the system, the check fails and crashes the app.
It seems the culprit is updateHttpProxy, which is called by
ProcessList when the PROXY_CHANGE_ACTION broadcast is sent.
If this happens to run between the time the process is created
and the activity thread is "bound", then the mInitialApplication
member is not set, and updateHttpProxy uses a system context.
Since ConnectivityManager caches the context forever in a
static, this leads to subsequent legitimate calls crashing.
Setting the proxy can be deffered until such a time that the
app is bound, as it can't run any code before then. The member
is never reset to null, so it's guaranteed to be non-null at
bind time.
An alternative would be to post a runnable on the handler
thread if the member is null to try again later. This
could however run the lambda a considerable number of times
as binding can be delayed, and risks causing an infinite loop
if some invariants are changed in the future.
See also b/73572062 and ag/4056059
Bug: 155549446
Bug: 189360509
Test: ActivityThreadTest FrameworksNetTests NetworkStackTests
Test: Manually set a proxy, observe the broadcast being sent and
apps not crashing
Change-Id: I956f76be2e0a1a675576511fb394d7ed4354b28a
(cherry picked from commit b0d13e29515d5b7c82daed7533b78ac57e46bd93)
2021-07-29 11:55:37 +09:00
Bryce Lee
d569b583cd
Show dream as idle mode.
...
This changelist shows the currently configured dream over
keyguard as the idle mode. A timeout then transitions the
dream to doze.
This is a stopgap solution as the dream is rendered using
existing windowing behavior outside of SystemUI.
Test: manual
Bug: 194230499
Change-Id: I101b3d89e7bca63aec398c0a0edffaa6957f39d0
2021-07-29 02:33:35 +00:00
Louis Chang
989b16a155
Merge "Allow embedding activities cross apps" into sc-v2-dev am: ed544a3473 am: 5a8748cec8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393225
Change-Id: I985c05864b631709feac6cbf53e9d98bce9a68ca
2021-07-29 02:12:17 +00:00
Louis Chang
5a8748cec8
Merge "Allow embedding activities cross apps" into sc-v2-dev am: ed544a3473
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393225
Change-Id: I796ae441693d412320886be7c5d7cfb0a915d9a6
2021-07-29 01:59:30 +00:00
Jeff Chang
7a5814c0f6
Merge "Fix the leak while remove the taskFragment" into sc-v2-dev am: e1fdf43e2a am: 94cb943a53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401455
Change-Id: Ib5af896aa83702c1a10e466daec10bd0bf2375f3
2021-07-29 01:54:45 +00:00
Louis Chang
ed544a3473
Merge "Allow embedding activities cross apps" into sc-v2-dev
2021-07-29 01:47:00 +00:00
Jeff Chang
94cb943a53
Merge "Fix the leak while remove the taskFragment" into sc-v2-dev am: e1fdf43e2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15401455
Change-Id: I455de3a09e25708fcbb023af605c345c734ee085
2021-07-29 01:40:59 +00:00
Dave Mankoff
afc8c1e22b
Merge "Move StatusBar.DemoMode to separate class." into sc-v2-dev am: 2f74dacda9 am: 5a02ab4dec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312954
Change-Id: If569a0af77bec5c1565aabc4f30a37f195bff70b
2021-07-29 01:32:57 +00:00
Dave Mankoff
ddd7693a93
Merge "Remove DemoMode Interface from StatusBar" into sc-v2-dev am: 94e516ab57 am: 682072c2f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312953
Change-Id: I1907d2163c027db6c5387f52bfa7f808413b02fd
2021-07-29 01:32:10 +00:00
Jeff Chang
e1fdf43e2a
Merge "Fix the leak while remove the taskFragment" into sc-v2-dev
2021-07-29 01:28:25 +00:00
Dave Mankoff
5a02ab4dec
Merge "Move StatusBar.DemoMode to separate class." into sc-v2-dev am: 2f74dacda9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312954
Change-Id: I50cf59d26f430c25cd34d0e0cd92d66932c7c377
2021-07-29 01:13:35 +00:00