Commit Graph

650707 Commits

Author SHA1 Message Date
TreeHugger Robot
dde0d6c8a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-14 05:39:58 +00:00
TreeHugger Robot
65d2948f11 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-14 05:39:07 +00:00
TreeHugger Robot
b448864515 Merge changes from topic "presubmit-am-ef6979eb0d794319a4c16a36a338836c" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35380b93b4
  Import translations. DO NOT MERGE ANYWHERE
2022-02-14 05:35:45 +00:00
TreeHugger Robot
cdb0a1f48f Merge changes from topic "presubmit-am-83614c0b76a14ebc87638664e51ddec9" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b6be55ad2a
  Import translations. DO NOT MERGE ANYWHERE
2022-02-14 05:34:50 +00:00
Bill Yi
04d2bc8896 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b6be55ad2a
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib84a0fe4eddb48d24fbac0b513fba301f472289d
2022-02-12 12:04:03 +00:00
Bill Yi
b6be55ad2a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icc4251be2571c31657c361f14952fe17897c8891
2022-02-12 12:03:43 +00:00
Bill Yi
e8b949d8b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic4862950d96d1f56378e4f70923110015c5d9a79
2022-02-12 03:51:51 +00:00
Bill Yi
d425d681a9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 67ed07c29b
Blank merge reason: commit message contains skip directive

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

Change-Id: I7284e62a8c2028b11a70b5cd165eb918f629c04c
2022-02-12 03:49:59 +00:00
Bill Yi
67ed07c29b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iea4984ed0ce67f276a9c966757e5cd5cb2753d41
2022-02-12 03:49:42 +00:00
Bill Yi
5e359a9a1a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35380b93b4
Blank merge reason: commit message contains skip directive

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

Change-Id: I4c392a3aaa72281b0b11a1c32f73fc6263af9daf
2022-02-12 00:01:07 +00:00
Bill Yi
4d89cd21ac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia3904bccb0d5d070931f297d74991c79bc129e27
2022-02-12 00:00:38 +00:00
Bill Yi
35380b93b4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3dd4bd848cd6a49968be821c33f435d87f3177e6
2022-02-11 23:58:11 +00:00
TreeHugger Robot
66694f7156 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours am: 50950b8adc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I425d80d190d6f0b268af733b4281adbb0177eac1
2022-02-11 23:36:44 +00:00
TreeHugger Robot
50950b8adc [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours am: 413b806a7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I456db8e70c2cc29245e1d5a5f55b62c0d5c572e2
2022-02-11 23:18:13 +00:00
TreeHugger Robot
413b806a7c [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours am: 2a6c047393 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2c4ec5f9a60a3b921681dd2b9b026e8713ad618
2022-02-11 23:00:11 +00:00
TreeHugger Robot
2a6c047393 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours am: d9a89e476c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cb0e66b4c5651c28a3cf38ac94c698737e25786
2022-02-11 22:42:38 +00:00
TreeHugger Robot
d9a89e476c [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours am: 6a4864ee21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I910c6754829f45d012104c992bcbc2a026622c1a
2022-02-11 22:29:13 +00:00
TreeHugger Robot
6a4864ee21 [automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44b5939f05d3d4bb3f7d78e79e32403de64e47f1
2022-02-11 22:12:20 +00:00
TreeHugger Robot
5e2939bd21 Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev 2022-02-11 21:55:06 +00:00
Matt Pietal
563fdf4259 [DO NOT MERGE] Keyguard - Treat messsages to lock with priority
When switching users and attempting to lock the device, the sysui main
thread becomes overwhelmed with events, creating a significant lag
between the time a message is posted and processed on the main
thread. This can be dangerous when these events are critical for
security, such as calls coming from PhoneWindowManager#lockNow() that
call KeyguardViewMediator#doKeyguardTimeout(). On older devices with
slower CPUs and less memory, the delay in processing can be
significant (15 - 30s).

The result of not prioritizing these events leads to a window of time
where a guest user can switch back to the owner, and gain access to
the owner's homescreen without needing to unlock the device with the
owner's credentials.

As a mitigation, prioritize two events originating in two specific
methods to make sure the device locks as soon as possible as well as
have the system server preemptively update its local cache.

Bug: 151095871
Test: Very manual race condition - follow steps listed in bug
Change-Id: I7585a0a5eeb308e0e32a4f77f581556d883b5cda
Merged-In: I7585a0a5eeb308e0e32a4f77f581556d883b5cda
(cherry picked from commit 28c53ab8bc)
2022-02-11 17:04:02 +00:00
TreeHugger Robot
ce05ecb877 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-dev am: 12fb3fb9f6 -s ours am: a6e82499df -s ours am: ebcdd5df68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ee33ef24ea32b7465c3fc13c06292f912ac69b0
2022-02-11 07:55:53 +00:00
TreeHugger Robot
ebcdd5df68 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-dev am: 12fb3fb9f6 -s ours am: a6e82499df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3a34a59446b574f439f1ce962d0997e781432ea
2022-02-11 07:42:34 +00:00
TreeHugger Robot
a6e82499df [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-dev am: 12fb3fb9f6 -s ours
am skip reason: Merged-In Iadc00568b09d0e122eefbe25c0c44820b3c24815 with SHA-1 4612f3c1c1 is already in history

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

Change-Id: Ia0806040569cfc7ee18702a6d5d794a70bed0c0d
2022-02-11 07:29:00 +00:00
TreeHugger Robot
12fb3fb9f6 Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-dev 2022-02-11 07:09:24 +00:00
TreeHugger Robot
a1a5d515bc [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-qpr-dev am: 56f4c6e7a5 -s ours am: 0b44f5da4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9688ceea130c8b58a243bd151685bad34c626ab7
2022-02-11 07:04:50 +00:00
TreeHugger Robot
0b44f5da4a [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-qpr-dev am: 56f4c6e7a5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67e859d6b6c2444fa12bf737732af2e8bf6d5593
2022-02-11 06:45:36 +00:00
TreeHugger Robot
56f4c6e7a5 Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-qpr-dev 2022-02-11 06:31:30 +00:00
Hui Yu
28827cf2f3 [automerger skipped] BG-FGS-start while-in-use permission restriction improvement. am: 89db7469f6 -s ours am: 6e2be82a51 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: Ice542280ee956a38917fe8382e6280353190e72c
2022-02-09 22:40:33 +00:00
Hui Yu
db77027de4 [automerger skipped] Merge "Revert "Merge "BG-FGS-start while-in-use permission restriction ..."" into rvc-qpr-dev am: 937036e0bd -s ours am: 7b11885031 -s ours
am skip reason: skipped by user huiyu

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

Change-Id: If1769b37a9cac1520fe1bf74b05b18f473efd65f
2022-02-09 22:40:17 +00:00
Jeff Chang
ba8b0e080f [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 53ee9c2472 am: be7090b09e -s ours am: b0cb54d596 -s ours am: 053326ecda -s ours am: 1d63bf0386 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67daae2481ec7b826db2676cf0b1a1d59b2af64e
2022-02-09 22:40:05 +00:00
TreeHugger Robot
1ce08c6773 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into rvc-dev am: 0e5e156955 am: e7de5cde40 -s ours am: 28ba78def8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia228d83b84181ae5a3c721a6748114bd80527806
2022-02-09 22:39:53 +00:00
Jeff Chang
bc5e033598 [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 2c87a8a7ce am: a04ffe4326 -s ours am: d5fed4ae64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8526a4ba7da4bedadbd7bda38f4230517ab7deec
2022-02-09 22:39:52 +00:00
Hui Yu
c574099607 [automerger skipped] Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: fc6fe37018 am: 3505ebb5f9 -s ours am: d16913a2bd -s ours
am skip reason: skipped by user huiyu

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

Change-Id: I4465f35c27451c78387c5d15fa51d4811fc8cf3d
2022-02-09 22:39:26 +00:00
Hui Yu
6e2be82a51 [automerger skipped] BG-FGS-start while-in-use permission restriction improvement. am: 89db7469f6 -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: I61a89510b2ab76a15336a1376a3a4bc84d8d6ac9
2022-02-09 22:38:45 +00:00
Hui Yu
7b11885031 [automerger skipped] Merge "Revert "Merge "BG-FGS-start while-in-use permission restriction ..."" into rvc-qpr-dev am: 937036e0bd -s ours
am skip reason: skipped by user huiyu

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

Change-Id: Ibe8b1a3fe4dc82b4e38c5f7feac8830b64d5ca65
2022-02-09 22:38:20 +00:00
Jeff Chang
1d63bf0386 [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 53ee9c2472 am: be7090b09e -s ours am: b0cb54d596 -s ours am: 053326ecda -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5339b84ab84c556143f4ad637bd4fda61bf58e8
2022-02-09 22:23:05 +00:00
TreeHugger Robot
28ba78def8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into rvc-dev am: 0e5e156955 am: e7de5cde40 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icbf18a2117847fee9b328cb53e4e134af243ff19
2022-02-09 22:22:09 +00:00
Jeff Chang
d5fed4ae64 [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 2c87a8a7ce am: a04ffe4326 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I169a506597dcc765e89cd224facedab1c16dbf75
2022-02-09 22:21:42 +00:00
Hui Yu
d16913a2bd [automerger skipped] Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: fc6fe37018 am: 3505ebb5f9 -s ours
am skip reason: skipped by user huiyu

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

Change-Id: I2bec32f7dcc4efa8f06f877cf308294f9ac2c495
2022-02-09 22:21:03 +00:00
Hui Yu
89db7469f6 BG-FGS-start while-in-use permission restriction improvement.
[This is a resbumit, previous fix ag/I0aca484e5a0dd051bbeac379d30b0fb4ecfa2da0
was reverted because the incorrect resetFgsRestrictionLocked() call]

Foreground service started from background shall not have while-in-use
access like location/camera/microphone.

Previously we set mAllowWhileInUsePermissionInFgs only at service start
by startService() or bindService() command. But after
service start, the Service.startForeground() call may be some time later
and at that time the caller may not be in the foreground any more. This
CL will add further restriction on that.

1. If the first Service.startForeground() call is more than 10 seconds (can be
configured by DeviceConfig key "fgs_start_foreground_timeout") after the
Context.startService() call, check the service's app proc state and set
mAllowWhileInUsePermissionInFgs again.
2. At Service.stopForeground() call, mAllowWhileInUsePermissionInFgs
should be reset to false so FGS while-in-use permission is not allowed.
3. After Context.startForegroundService()(or Context.startService()) ->
Service.startForeground() -> Service.stopForeground(), the second or
more times Service.startForeground() is called, check the service's
app proc state and set mAllowWhileInUsePermissionInFgs again.

This CL is the backport of ag/Idc88f274c7a323d175d65bb47eca041772ae9bb7 from
S branch.

Bug: 183147114
Bug: 183204439
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testStartForegroundTimeout
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSecondStartForeground
Change-Id: Ie8712b8efe85aa8a6769b811c85a29c4013e58b9
Merged-In: Idc88f274c7a323d175d65bb47eca041772ae9bb7
2022-02-09 21:44:21 +00:00
Hui Yu
937036e0bd Merge "Revert "Merge "BG-FGS-start while-in-use permission restriction ..."" into rvc-qpr-dev 2022-02-09 18:25:59 +00:00
Hui Yu
3021dae9b2 Revert "Merge "BG-FGS-start while-in-use permission restriction ..."
Revert "Merge "Add test cases for background startForeground() i..."

Revert submission 16823812-am-d28c94b9fe6445eba259ecb421887d7e

Reason for revert: It cause down stream automerge problem into sv-dev. 
Reverted Changes:
I0f8fb6de7:Merge "BG-FGS-start while-in-use permission restri...
I6305f8e37:Merge "Add test cases for background startForegrou...

Change-Id: I5bb8470e113fc6ce2de5d90159c22002140208c4
2022-02-09 18:14:14 +00:00
TreeHugger Robot
0dd3315653 [automerger skipped] Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev am: 7d43598fdf -s ours
am skip reason: Merged-In Id262b9a0de58d8834c85d925cf84bb44b8b99742 with SHA-1 e41e04bb8c is already in history

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

Change-Id: Iad9bcd8884e85f1ff789760570da3554b0627a9f
2022-02-09 18:10:37 +00:00
TreeHugger Robot
7d43598fdf Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev 2022-02-09 17:53:50 +00:00
TreeHugger Robot
459761c7a3 Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev
* changes:
  [automerge] Security fixes for PendingIntent related apis in LauncherApps 2p: e41e04bb8c
  Security fixes for PendingIntent related apis in LauncherApps
2022-02-09 17:53:50 +00:00
Jeff Chang
053326ecda [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 53ee9c2472 am: be7090b09e -s ours am: b0cb54d596 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba705847fda2c50a435113e9dad9554f559eb270
2022-02-09 17:52:46 +00:00
TreeHugger Robot
e7de5cde40 Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into rvc-dev am: 0e5e156955
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743363

Change-Id: I39fb93608e88a2478410faabd5c1bcf70300e740
2022-02-09 17:52:01 +00:00
Jeff Chang
a04ffe4326 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 2c87a8a7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743363

Change-Id: Ifdf47e595d507cd8d67bb968b1234a5d11d2b387
2022-02-09 17:51:46 +00:00
Hui Yu
3505ebb5f9 Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: fc6fe37018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16804648

Bug: 183147114
Change-Id: I0f8fb6de7a994f67061d57cb8b9bf89a271bb45d
2022-02-09 17:40:16 +00:00
Jeff Chang
b0cb54d596 [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 53ee9c2472 am: be7090b09e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d20a426e2f84a3bb4ef16999924024ba93e4e21
2022-02-09 13:02:10 +00:00