Commit Graph

758417 Commits

Author SHA1 Message Date
Xiaowen Lei
4e8c47efbb Merge "Revert "Icon: make Icon's Bitmaps immutable"" into tm-dev 2022-04-23 02:12:46 +00:00
TreeHugger Robot
6758035315 Merge "Checks that state requested from top app is a state we allow" into tm-dev 2022-04-23 02:02:13 +00:00
Joe Bolinger
320c2e6622 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours am: c0d3a87af0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036

Change-Id: I61d2ef1b560ef711293a66a5148479a437599ba4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:42:32 +00:00
Joe Bolinger
4a5f22611a [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a005 -s ours am: 1cf3ad5fc4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036

Change-Id: I267ddc0334fd2628e0da7e50eba6e49dab414a53
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:42:09 +00:00
Joe Bolinger
67c38a0f5e [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: 2f91e4e8d5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: I5dd754d634a70f29de88d2ae348b474eda848735
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:17:33 +00:00
Joe Bolinger
7f4a849c98 Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: 110c9b4c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: I18ec59ce6b38525ad98acf5d9b0d782b683a8362
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:17:00 +00:00
Presubmit Automerger Backend
16c3412734 [automerger skipped] [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f8682f am: a3744e1b2c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: I8e5329dd4d7a11f59fa6ac8e928e0e823413945b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:16:31 +00:00
Joe Bolinger
c0d3a87af0 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036

Change-Id: I54bf0eb100644ef2c8af8736fe8c0729e5b9c8e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:16:25 +00:00
Joe Bolinger
1cf3ad5fc4 [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a005 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036

Change-Id: Idbfb2ef0faa3a44be397d42c724d06c3d44fb31b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:16:20 +00:00
Joe Bolinger
2f91e4e8d5 Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: I51a7f516c0ddd3a99b4f906cdaa361e5f1652aec
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-23 00:15:31 +00:00
Joe Bolinger
5cdb1689bb Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev 2022-04-22 23:44:03 +00:00
Joe Bolinger
110c9b4c1e Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod
* changes:
  [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f8682f
  [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService.
2022-04-22 23:43:45 +00:00
Joe Bolinger
c8347811b2 Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev 2022-04-22 23:43:44 +00:00
Makoto Onuki
e1851000e7 Merge "Remove STOPSHIP" into tm-dev 2022-04-22 23:33:10 +00:00
Xiaowen Lei
8fd35436fa Revert "Icon: make Icon's Bitmaps immutable"
This reverts commit 47032a2095.

Reason for revert: DroidMonitor: Potential culprit for Bug 230140012 -
verifying through ABTD before revert submission. This is part of the
standard investigation process, and does not mean your CL will be
reverted.

Change-Id: I22f5aa5bd57e37d638292773986b479428e5cdbc
2022-04-22 23:26:47 +00:00
Santiago Etchebehere
791c612714 Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev 2022-04-22 21:07:18 +00:00
Santiago Etchebehere
d7816f0bba Revert "Remove check for preventing re-parenting non-split apps"
Revert "Use new onStartSplitLegacy when starting split from overview"

Revert submission 17779173-startSplitLegacy

Reason for revert: Broken build: b/230129218
Reverted Changes:
I01590e53c:Remove check for preventing re-parenting non-split...
I696749f76:Use new onStartSplitLegacy when starting split fro...

Change-Id: I754bc308f37eea2fc50eda2b9df068adf711a268
2022-04-22 21:02:22 +00:00
Caitlin Cassidy
b1b22000d6 Merge "[Media] Allow a11y interactions to change seekbar position." into tm-dev 2022-04-22 20:27:19 +00:00
James O'Leary
b2af04737d Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev 2022-04-22 20:23:28 +00:00
James O'Leary
ca46e52c30 Merge "Create ResolverComparatorModel interface." into tm-dev 2022-04-22 20:23:23 +00:00
James O'Leary
6876316dc0 Merge "Clean up ResolverListAdapter::rebuildList()." into tm-dev 2022-04-22 20:23:18 +00:00
James O'Leary
c10fc9cdd0 Merge "Ignore some Chooser tests that flake on races." into tm-dev 2022-04-22 20:23:12 +00:00
Alex Buynytskyy
e06f5b1a31 Merge "Reduce lock contention on setting write." into tm-dev 2022-04-22 20:08:00 +00:00
Sooraj Sasindran
47a78f3de4 Merge "Allow device owner to configure preferential network service" into tm-dev 2022-04-22 20:04:58 +00:00
TreeHugger Robot
b9fc2e8d7e Merge "Remove check for preventing re-parenting non-split apps" into tm-dev 2022-04-22 20:03:37 +00:00
Joe Bolinger
e133038ef5 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-v2-dev am: c7fdbcf15a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630873

Change-Id: I4082bc8805203978bbcc0246aea5c7a2b86565ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:51:31 +00:00
Joe Bolinger
f9c39c4bb4 [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 2d60fb3647 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630873

Change-Id: I19bba08b9ecfb4c3a6de0393fd7b7ae4228dab29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 19:51:00 +00:00
TreeHugger Robot
5389f565af Merge "Remove NOT_RESTRICTED from basic network requests." into tm-dev 2022-04-22 19:37:06 +00:00
Songchun Fan
d165ccf648 Merge "[AppsFilter] use snapshots instead of live data" into tm-dev 2022-04-22 19:32:49 +00:00
Joe Bolinger
c7fdbcf15a Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-v2-dev 2022-04-22 19:17:10 +00:00
Joe Bolinger
50941f8b9c Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." into tm-dev 2022-04-22 19:16:48 +00:00
Josh Tsuji
1254f9161f Merge "Add keyguardGoingAway to the state controller." into tm-dev 2022-04-22 18:59:58 +00:00
Xiaowen Lei
840168a510 Merge "Add logging for Smart Space on Dream surface." into tm-dev 2022-04-22 18:48:50 +00:00
Greg Kaiser
375d7c417c Merge "Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"" into tm-dev 2022-04-22 18:14:18 +00:00
Tim Murray
227085759c Merge "Icon: make Icon's Bitmaps immutable" into tm-dev 2022-04-22 17:52:31 +00:00
Caitlin Cassidy
cfb68860ae Merge changes I72eaf3f2,Ibb3c8d9d into tm-dev
* changes:
  [Media] Allow output switcher chip to handle larger font sizes without cutting off the test.
  [Media Recs] Hide the title / subtitle views if none of the albums have titles / subtitles so that the album art is centered better.
2022-04-22 17:41:50 +00:00
TreeHugger Robot
64b875e125 Merge "[SettingsProvider] Add maxTargetSdk=S to ALWAYS_ON_VPN_LOCKDOWN_WHITELIST" into tm-dev 2022-04-22 17:17:23 +00:00
Sally Yuen
c98812f8f5 Merge "Remove recycling references in A11yNodeInfo" into tm-dev 2022-04-22 16:52:05 +00:00
Joshua Trask
dc029cbba7 Clean up ResolverListAdapter::rebuildList().
Behaviorally, this is *almost* a pure refactoring. It does make
one very minor logic change(*) that could hypothetically fix a
race condition, although no particular bugs have ever been
observed as a result (nor do they seem especially probable), and
it's unknown what the severity would be if they ever were to occur.

Additionally, this change clarifies existing comments and adds
more inline documentation to help understand the rebuildList()
flow. Code cleanup identifies a few areas where the current design
seems a little clumsy, noted with new "TODO" comments in the code.
There's room for more improvement, but this function plays an
important role in preparing Sharesheet targets, so it's good to
bring attention to these thorny requirements.

For justifications of behavioral equivalence and other metacognitive
notes, see comments in the code review.

(*) The one behavior change is called out in code review comments;
    briefly, the line of code that sends a synchronous "results
    pending" event used to follow the line that started the async
    flow that would result in a "results complete" event. This
    could hypothetically race if the async work finished and sent
    "results complete" before we got to the "results pending" line.

Bug: 227486788
Test: `atest ChooserActivityTest` (no behavior changes expected)
Change-Id: I2e74d68579be8b34716ba2202ac2a08361008400
Merged-In: I2e74d68579be8b34716ba2202ac2a08361008400
(cherry picked from commit 1e42cad19b)
2022-04-22 16:09:09 +00:00
Joshua Trask
08df009e8d Ignore some Chooser tests that flake on races.
As described in b/222124533, the reliability of these tests
can be improved with a timeout, but that's still not a very
solid fix. We should just ignore them for now so they stop
breaking on the monitor, and meanwhile I'll continue
investigating the root cause.

Bug: 222124533, 220337209, 220959679, 218218953
Test: disabling tests only
Change-Id: I113a1ba4de2176e209339a1cbbe2583cb5fe518c
Merged-In: I113a1ba4de2176e209339a1cbbe2583cb5fe518c
(cherry picked from commit 2864475fd7)
2022-04-22 16:08:52 +00:00
Joshua Trask
6cdd926f43 Create ResolverComparatorModel interface.
Define the API for interacting with comparator model data;
provide implementations for our two current model types; and
(as a first step) re-write our legacy ResolverComparators
to be implemented internally in terms of their new model types.

This is the first CL in a multi-part cleanup of the
AbstractResolverComparator design. This demonstrates that the
role of an AbstractResolverComparator sub-class amounts to
(i.e., Ctrl+F "@Override") some amount of work to prepare model
data; some cleanup; and a set query methods against data that
*really should be* immutable (separated in this CL as the new
ResolverComparatorModel interace). Any remaining responsibilities
of the abstract base class would be better handled (in a subsequent
CL) by an external controller operating on a ResolverComparatorModel
(i.e., preferring composition to inheritance). The async
model-preparation steps should also be separated and cleaned
up (in a later CL).

I believe this to be a pure refactoring with no observable side
effects. While the new design aids in implementing the correct
"immutable snapshot" style, for now I've written the new
ResolverComparatorModel implementations to preserve any possible
quirks in the legacy implementations. Nevertheless, if some
inadvertant behavior change is introduced as a result of this CL,
it's most likely to be a bug-fix where we previously would've mixed
in stale data. A later CL will intentionally pursue those fixes.

Test: atest ResolverActivityTest ChooserActivityTest
Bug: 227486788
Change-Id: If88bf7a5a6394d81c021782d5d9bce7955f1c0e6
Merged-In: If88bf7a5a6394d81c021782d5d9bce7955f1c0e6
(cherry picked from commit 8b5d279d90)
2022-04-22 16:05:39 +00:00
Joshua Trask
ca014a873b Fix(?) for some disabled ChooserActivityTest cases
These tests (testShortcutTarget{With,Without}ApplyAppLimits) are
currently disabled by @Ignore annotations, and I'm not re-enabling
them in this CL because I'm not sure that they won't flake -- I
just know that this was an easy (and understandable) fix when I
tried to run these tests locally, and I'd like to preserve that
fix for posterity.

Test: Re-enabled the tests and confirmed they passed only w/ fix
Bug: 208803748
Change-Id: I5268e3324d3cec9f6a72aee5de9ec1f06e45e987
Merged-In: I5268e3324d3cec9f6a72aee5de9ec1f06e45e987
(cherry picked from commit 72b8b079b5)
2022-04-22 16:04:58 +00:00
Matt Casey
31cc9ddb59 Merge "DeviceConfig for Chooser update-delay duration." into tm-dev 2022-04-22 16:03:38 +00:00
Alex Buynytskyy
31c17f46f2 Reduce lock contention on setting write.
Context: go/pm-settings-persistence

0. The main issue is a background thread holding to 2 major and 1
   less-major locks for a long time.
1. Refactor Settings.writeStateForUser* not to take PMS lock in advance.
2. Add an option to move PMS-locked processing into PMS handler thread,
   executing on a big core with DEFAULT priority.
3. Make XML serialization use its own lock.
4. Move XML serialization + IO to background thread.
5. (separate CL) slightly optimize XML serialization. It's still an AI
   to move it to Fast/Binary serializers.

Bug: 220083428
Test: presubmit
Change-Id: I428d46d90c3ceef55a83358f5f3b2cddbce60efd
2022-04-22 15:34:49 +00:00
Greg Kaiser
d2a49af618 Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"
This reverts commit 3fd4c55d6d.

Reason for revert: Fatal exception
Bug: b/230095156

Change-Id: I5a3220a2d9466f8fbcd07840282b2c47f566e154
2022-04-22 15:28:03 +00:00
Lucas Dupin
06ac74c54f Merge "Don't trigger full relayout if DateTimeView doesn't change" into tm-dev 2022-04-22 15:21:23 +00:00
Ricky Wai
0fbae018dc Merge "Add OEM config for enhanced confirmation mode and add restricted read ops" into tm-dev 2022-04-22 14:53:01 +00:00
Songchun Fan
5990b7f6f2 [AppsFilter] use snapshots instead of live data
Remove all runWithStates that use the live data and use snapshots
instead. This ensures that if AppsFilter is called by a snapshot, it
uses the data from the same snapshot. Also prevent corner-case lock
contentions where a snapshot calls to acquire mPm.mLock.

BUG: 226668722
Test: unit test
Test: manual check of boot time
Change-Id: I2b8472659392b9e7c499bb816dd23e9470655af4
Merged-In: I2b8472659392b9e7c499bb816dd23e9470655af4
2022-04-22 13:46:30 +00:00
Beverly Tai
3f28fc9946 Merge "Always update lockscreen UDFPS icon's progress" into tm-dev 2022-04-22 13:44:16 +00:00
Alex Johnston
c170d9adf0 Merge "Make screen capture per-device DO and COPE" into tm-dev 2022-04-22 09:29:12 +00:00