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
fda724a5be
Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev
2021-07-29 06:56:35 +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
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
Louis Chang
ed544a3473
Merge "Allow embedding activities cross apps" into sc-v2-dev
2021-07-29 01:47:00 +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
f5da4bd267
Move KeyguardStateController.Callback to field of StatusBar.
...
Bug: 190746471
Test: manual
Change-Id: I6a2663ba37d7a94574e3d43403dca9616586ca3d
2021-07-28 21:13:07 -04:00
Dave Mankoff
2f74dacda9
Merge "Move StatusBar.DemoMode to separate class." into sc-v2-dev
2021-07-29 00:57:57 +00:00
Dave Mankoff
94e516ab57
Merge "Remove DemoMode Interface from StatusBar" into sc-v2-dev
2021-07-29 00:57:38 +00:00
Emilian Peev
e922ec31aa
Merge changes from topic "b194508189" into sc-dev
...
* changes:
Camera: Support common outputs between regular and extension sessions
Camera: Include the parceled image dimensions
2021-07-29 00:20:06 +00:00
Matt Pietal
7d938ee7f4
Make sure SIM PIN screen shows
...
It is possible to receive SIM events that alert the keyguard to show
the SIM PIN unlock screens. However, if these events are received
after keyguard has been told to dismiss but before it is actually
dismissed, this event gets ignored.
The fix: add a flag to look for this state. If we get the keyguard
dismissed event and the bouncer has not shown, bring back to the
keyguard.
Fixes: 192048149
Test: atest KeyguardViewMediatorTest
Change-Id: I43de785252827d78a86d075ee7ec0861778e3360
2021-07-28 19:37:09 -04:00
Jayant Chowdhary
782b4e9e08
Merge "camera2: Add fwk-only tags for SCALER_CROP_REGION and metering regions." into sc-dev
2021-07-28 22:45:01 +00:00
Rahul Sabnis
7a3cb23bf9
Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" into sc-dev
2021-07-28 22:04:30 +00:00
Andras Kloczl
75eddd350e
Add new shell commands for DeviceStateChanged CTS test
...
For the new CTS test for DeviceStateChanged metric we
need commands with simple outputs to determine the current
device state and the supported states.
Bug: 181542365
Test: flash device with framework changes then $ atest DeviceStateStatsTests
Change-Id: Icb2e755e258f8c3dba3aed34b37cdb7295df5434
2021-07-28 22:45:32 +01:00
Chris Tate
e833132601
Merge "Consistent reporting of failure conditions" into sc-dev
2021-07-28 21:19:45 +00:00
Evan Rosky
58fd4834b9
Merge "Enable keyguard remote animation when WMShell is used." into sc-v2-dev
2021-07-28 20:37:38 +00:00
Lyn Han
0f8dfa5326
Add logs to ensure that QS / NPVC clip bounds match
...
Bug: 191436459
Test: treehugger
Change-Id: I07dbb58b234bee06c31a67fd38ab363ff13d9458
Merged-In: I07dbb58b234bee06c31a67fd38ab363ff13d9458
2021-07-28 20:26:25 +00:00
Beverly
63bca4985b
Rescan face when user preses empty space on LS
...
For both bypass + non-bypass face auth.
Test: manual
Fixes: 194866908
Change-Id: I22014fb5dc2913c70a405ea41850719e03353a80
2021-07-28 16:26:23 -04:00
Beverly
10bff88e83
Don't setDeviceEntryIntent on AOD
...
Only setDeviceEntryIntent=true if we're on the lock screen (not on AOD).
We do this b/c the tap on the udfps area on AOD could have been an accident.
Test: manual, UdfpsControllerTest
Fixes: 194921838
Change-Id: Ief2518f88f27fae01abe4bd72cb677b03e4e525a
2021-07-28 16:14:57 -04:00
Riddle Hsu
7b4e645ce0
Merge "Wait for notification shade to redraw on orientation change" into sc-dev
2021-07-28 20:08:18 +00:00
Songchun Fan
5a4e8283e9
[pm] ignore partial progress update after off-incfs migration
...
When we migrate a partially loaded app off incremental, the incomplete
progress could still be reported by incfs, right before the incfs
instance is deleted. This partial progress could override the full
progress reported by the update installation. And after the incfs
instance is deleted, there will be no more progress update. As a result,
the launcher gets the last progress update as a partial progress, and
the progress loading icon remain partially loaded until reboot.
This CL fixes the problem by rejecting partial progress reported from
incfs after the progress has already been changed to 100%. In reality it
could only happen during off-incfs migration. It also applies in general as
the progress number should never go from 100% to below 100%.
BUG: 187762951
Test: manual
Change-Id: I3b87226a4e75d71f0d8e4886917e4456b355e1fa
2021-07-28 19:16:13 +00:00
Ameer Armaly
1219bfb27f
Merge "TouchExplorerTest: fix run error." into sc-dev
2021-07-28 19:08:31 +00:00
Daniel Sandler
299c0567a5
Merge "Fix missing exported=true in manifest." into sc-dev
2021-07-28 18:54:41 +00:00
Rubin Xu
384e3586f6
Merge "Stop managed profile owner granting READ_SMS" into sc-dev am: 28e4c5d57a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371691
Change-Id: I0d9242aa9682a7bfa8ff972ebd4356160e23fce3
2021-07-28 18:29:27 +00:00
Mingming Cai
23ba83b769
Merge "Fix CQI range in CellSignalStrengthNr" into sc-dev am: 2d5cbc5d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394377
Change-Id: I6fa423ff94b7961e3811e226159cf36f2db8a418
2021-07-28 18:27:31 +00:00
TreeHugger Robot
fe8265d540
Merge "Prevents scroll capture from targetting secure windows" into sc-dev am: 7ee0307aed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374948
Change-Id: Ib82bb7493168be0477f6631f41eca24e7bead5b9
2021-07-28 18:27:15 +00:00
Peter Kalauskas
11b8259c10
Fix crash when running UserSwitcherControllerTest am: f69d25f7f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363327
Change-Id: I5d100df3cbbd7b2941e2ef9e7566dd0d399817f0
2021-07-28 18:26:47 +00:00
Peter Kalauskas
25ba224a67
Add tests for guest user metrics am: 7c060b2951
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959153
Change-Id: I9cc6353daa0653e02ba2d80651496f706b41c309
2021-07-28 18:26:37 +00:00
TreeHugger Robot
f982f4d57e
Merge "Add ART's module-lib to "module_current"" into sc-dev am: d1ccddb79a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15391790
Change-Id: Ibef82b2ea6117cb4db70a3b157e8831f50aa0b3c
2021-07-28 18:26:23 +00:00
Daniel Sandler
2f9eb3749a
Merge changes from topic "egg-finally" into sc-dev am: a380ffbff1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389098
Change-Id: Ib44ef0b0a8ee383c8c9eff35f8e8804247da01cc
2021-07-28 18:25:56 +00:00
Kevin Chyn
8453590498
Merge changes from topic "facemanager-bypassflag" into sc-dev am: 88a506aad4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377220
Change-Id: I7d27fc16814e25da0d0b5eaa92d43073aedb8d42
2021-07-28 18:25:42 +00:00
Josh Tsuji
c06c8b5769
Merge "Reset to LiftReveal when going to sleep due to timing out, after a biometric auth." into sc-dev am: 7db2ece5c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362342
Change-Id: I2c57d9a8da7656a0219fdc5f67355a1df72a1331
2021-07-28 18:25:24 +00:00
Siim Sammul
76b63d54cf
Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830 " into sc-dev am: 6c852aeabc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904
Change-Id: Ibaae003e403fc6d20002a62241ec23a0fa97f2ce
2021-07-28 18:25:11 +00:00
Shubang Lu
2233656aa0
Merge "Change default value from NONE to UNKNOWN" into sc-dev am: 8e31f85e02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377214
Change-Id: Id8efdbbf549be60cf2ba769b2cceafdba239b1ac
2021-07-28 18:24:32 +00:00
Ahaan Ugale
342d24c807
Merge changes I212ad58c,Idf5dd82d into sc-dev am: 0e3d3b90ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15360457
Change-Id: I9175ddb251f30c0eaff0e3549e7bd31f28d40623
2021-07-28 18:24:20 +00:00
Alison Cichowlas
7bed52f477
Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016
Change-Id: I37ce8ef56bc0cb8efd24e899406f30b7242738ae
2021-07-28 18:24:05 +00:00
Evan Severson
28a1e08250
Merge "Update mic/cam quicksetting toggles when user changes" into sc-dev am: 4e09234999
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365189
Change-Id: Ic39ae9f48e20b8ecdb1b10c9b19d7232aadbe661
2021-07-28 18:23:54 +00:00
TreeHugger Robot
aae31da438
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ef631b164a -s ours am: f4b27a4b99 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379253
Change-Id: I84fb747bfd74a2f91f6e134fb1a128e0f9ee3046
2021-07-28 18:23:46 +00:00
TreeHugger Robot
d562ea23f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 610c28b301 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379174
Change-Id: I8b0f717f5fd2b15cc18a61aef2aefecb9c5e73eb
2021-07-28 18:23:39 +00:00
TreeHugger Robot
5365402f04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc138220ac -s ours am: db0c120536 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373206
Change-Id: I5bb7c3b7fc3ddc5c6b345a35238c1e757bae9ea0
2021-07-28 18:23:32 +00:00
Andrii Kulian
ef81c4557f
Merge "Avoid re-adding to existing split" into sc-v2-dev
2021-07-28 18:23:30 +00:00
TreeHugger Robot
e2a6ff20d1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9f54adfa3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379171
Change-Id: I1cd8e8011602d606b39591dd30f858529d49b3c3
2021-07-28 18:23:25 +00:00
Ahaan Ugale
16fc973412
Merge "Add null pointer check for callback in HotwordDetectionConnection." into sc-dev am: f569f09b5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327988
Change-Id: I5242bff4f029d1c213218ba3abff13de4bf0561b
2021-07-28 18:23:15 +00:00
Ahaan Ugale
affd1add48
Merge "Copy ContentCaptureOptions into derived Contexts" into sc-dev am: 2db19f5679
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15352571
Change-Id: Ib07e5a19501d5d54e4dfa4732cf2cb3ce119a898
2021-07-28 18:22:38 +00:00
SongFerng Wang
242f8871fe
Merge "Modify KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL's description" into sc-dev am: 75b43af58b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359955
Change-Id: Ic373a393c23fbebb8d453c2358bdd96a5a0b0071
2021-07-28 18:22:14 +00:00
TreeHugger Robot
d3a95b5c2c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6791bf04cd -s ours am: 23ff9d219d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379070
Change-Id: I12e40bcca7a7ffd09940cab4594c093c37ec2958
2021-07-28 18:22:03 +00:00