Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,440 Commits 3 Branches 0 Tags
fcaf2e20ba7673c6aed558f18bf963f45ea3323d
Commit Graph

485440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miranda Kephart
1eecc874b6 [DO NOT MERGE] Make screenshot error notification PendingIntent immutable 
Bug: 178189250
Test: manual (using POC in bug)
Change-Id: I787915c0493d18500e7531bd0ca7191532441f93
 2021-02-08 16:46:00 +00:00
Bill Yi
98807ed3a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-02-07 15:17:50 +00:00
Bill Yi
7e96efaa6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I82d9b006dea54828dccbfd3437904f2d30db3457
 2021-02-07 03:36:58 +00:00
Michael Groover
9b85c6411e resolve merge conflicts of a13fc7f314 to qt-qpr1-dev 
Bug: 173421434

Change-Id: Ia5912645861a88e819189321861ffd81240c34d6
Merged-In: I03072c65e1c7101538a7a20541d2ac59a2d213e3
 2021-02-05 23:57:15 +00:00
Anton Hansson
0e3d5f1ec9 Merge "Move shared module build rules to common repo" into mainline-prod 2021-02-04 14:58:56 +00:00
Evan Laird
cc5d7fe3d4 DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I074d7d635db77155b96ba0a457ec26d7c471de79
 2021-02-04 00:25:59 +00:00
Evan Laird
24a1d2c990 DO NOT MERGE: Associate notif cancels with notif posts 
CancelNotificationRunnables just spin on the work handler of
NotificationManagerService, hoping that they get executed at the correct
moment after a PostNotificationRunnable and before the next
EnqueueNotificationRunnable completes. Otherwise, you end up in a bad
state where the cancel either is canceling notifications before they get
a chance to post, or missing its only chance to cancel the notification
(for instance, ActivityManagerService is the only caller that can cancel
FGS notifications).

This change attempts to execute a CancelNotificationRunnable at the
moment its run() method is called, otherwise it associates the runnable
with the latest enqueued notificaiton record which has yet to post.

It then associates PostNotificationRunnable with the delayed cancel
list, executing any missed cancel operations immediately upon finishing
the PostNotificationRunnable.

Test: atest SystemUITests NotificationManagerServiceTest; manual
Bug: 162652224
Bug: 119041698
Change-Id: I88d3c5f4fd910a83974c2f84ae3e8a9498d18133
 2021-02-03 15:53:58 -05:00
Anton Hansson
56ca66dd90 Move shared module build rules to common repo 
Keep the limited visibility rule in this Android.bp though, to avoid
the unwanted default of "public".

Test: m
Change-Id: I6e6d32eb7269411350cdd3f635d9c461edcfcb6f
 2021-02-03 18:57:01 +00:00
TreeHugger Robot
3423761cb2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-02-03 18:11:16 +00:00
Bill Yi
b79407ee69 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-02-03 16:57:44 +00:00
Miranda Kephart
cd03af9a75 Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id117440e72aa19d0a31f97ad1f69f8f348eef06f
 2021-02-03 16:33:07 +00:00
Miranda Kephart
75b246725c [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If430bf7d7e2d9025e1e408c02abe353429258666
 2021-02-03 16:33:03 +00:00
Miranda Kephart
ec9dd28b39 Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev 2021-02-03 16:00:14 +00:00
Miranda Kephart
b6207acce7 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cfd0 -s ours am: 3687a2834e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420830

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a5aa0e6e52faed9b35a0f45374e4660e7081c6d
 2021-02-03 15:41:35 +00:00
Bill Yi
64f51564db Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I30d5de600d29c4db30b32320e2a42d7284d2566c
 2021-02-03 15:14:01 +00:00
Miranda Kephart
250d08c924 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a57ee51cebdbcbe75570793e563f10aed729447
 2021-02-03 15:04:05 +00:00
Miranda Kephart
c7d3369e99 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e44ec7b9977eecc5123e08caee3a1013fd4e727
 2021-02-03 15:03:38 +00:00
Miranda Kephart
3687a2834e [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cfd0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06660d88e828c78714065433895b5540676b9656
 2021-02-03 15:02:54 +00:00
Miranda Kephart
663162c3b0 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ff9ccd3bc986910f8bc1a75a971fe108a76020f
 2021-02-03 15:02:15 +00:00
Miranda Kephart
a5141a4b96 [DO NOT MERGE] Close screenshot process on user switched 
Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd15)
 2021-02-03 14:29:12 +00:00
Miranda Kephart
21eb07cfd0 Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev 2021-02-03 14:28:27 +00:00
Miranda Kephart
e0135acaa6 Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev 2021-02-03 14:27:52 +00:00
Miranda Kephart
5a8e9742ed Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev 2021-02-03 14:26:24 +00:00
Miranda Kephart
84fcb616be Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev 2021-02-03 14:23:55 +00:00
Bill Yi
852adab4a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I72d10ad2d55addeebe520844cd0d4a30a698531b
 2021-02-03 07:42:24 +00:00
TreeHugger Robot
77d6da8435 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1166627468f5d11aef69301318658eb7f4aae84
 2021-02-03 02:19:41 +00:00
Eugene Susla
4a510d0fc5 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia27241123b2266977e887afd36f17ceae35c8c2b
 2021-02-03 02:19:36 +00:00
TreeHugger Robot
6759663285 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev 
* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
 2021-02-03 01:36:09 +00:00
TreeHugger Robot
0847618070 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8033d0e1c60c957aa149c052dd1ba653f5449d5d
 2021-02-03 01:33:51 +00:00
Eugene Susla
80d043197c [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia736a9acfe1f91e2a8d86cb8b7221a1472e5195f
 2021-02-03 01:33:43 +00:00
TreeHugger Robot
8a94c6d854 Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a753 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180243

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadd818bb9c25841ab7b36f3ba3273bab23246e6f
 2021-02-03 01:23:15 +00:00
Eugene Susla
c51c89f233 Prevent non-system overlays from showing over CDM UI am: d7f514abbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13121152

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb4d00ec2b870d5ffaffc49137c0da039d240bb5
 2021-02-03 01:23:12 +00:00
TreeHugger Robot
5382574928 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev 
* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
 2021-02-03 01:07:11 +00:00
TreeHugger Robot
f82228a753 Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev 
* changes:
  Allow CDM to hide overlays
  Prevent non-system overlays from showing over CDM UI
 2021-02-03 00:48:45 +00:00
TreeHugger Robot
ef43403a6b [automerger skipped] Merge "Fix thread safety issue on clearing cache" into rvc-dev am: 5d559ac700 -s ours 
am skip reason: Change-Id I47d53a6d9d274bca4c78dbfd87e0097091b7b8cb with SHA-1 5e74205b8b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d05a4c47725d0c080d7c625dcd64ad0a6b2eee4
 2021-02-03 00:37:37 +00:00
TreeHugger Robot
5d559ac700 Merge "Fix thread safety issue on clearing cache" into rvc-dev 2021-02-03 00:16:26 +00:00
TreeHugger Robot
faea606f1b Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe am: 519201b871 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95182b4ce7c210d69b04f5ba9102900dded62366
 2021-02-03 00:05:52 +00:00
Eugene Susla
6880e2e6d0 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours am: 282a2a51b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5079f83997888461885535de398d57357d76341d
 2021-02-03 00:05:50 +00:00
TreeHugger Robot
57f2f3fedd [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id584e0fea1291f173663db118b9e44323d360f7f
 2021-02-03 00:05:33 +00:00
Michael Groover
540b50bbe7 Merge changes from topic "173421434-SubInfo-ICCID-qt-dev" into qt-dev 
* changes:
  Add method to clear out SubscriptionInfo#getCardString
  Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
  Update the getIccId docs to reflect access requirements
 2021-02-03 00:02:52 +00:00
TreeHugger Robot
519201b871 Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 am: 82b0600bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18cb7361ca96526aa490e5e5be697e8f9f5660b8
 2021-02-02 23:50:06 +00:00
Eugene Susla
282a2a51b4 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 am: 175d275bb9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8d440710fb9aa9a206b6da61af96c2eb53fac63
 2021-02-02 23:50:02 +00:00
TreeHugger Robot
82b0600bfe Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b am: 260d69a4d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64ece3292d6cd088455547b0365ea4ffc8e6378c
 2021-02-02 23:49:50 +00:00
Eugene Susla
175d275bb9 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours am: 56cc3b82c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bdb66b2c06a2a1ae249c0eb31dac2ae8101fbbb
 2021-02-02 23:49:46 +00:00
TreeHugger Robot
0debf904b1 [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34ea04b7480c79673ee9657abc59ab799f0a039
 2021-02-02 23:49:43 +00:00
TreeHugger Robot
260d69a4d5 Merge changes from topic "cdm_overlay-pi-dev" into pi-dev am: 99e5a28c5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dc66b1d02903fbf4bdbd6053787168281bedcd6
 2021-02-02 23:30:04 +00:00
Eugene Susla
56cc3b82c2 [automerger skipped] RESTRICT AUTOMERGE am: 486773ff45 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59451725f8eea4a9a6587d7f8d3272a24ee486e4
 2021-02-02 23:29:59 +00:00
TreeHugger Robot
a6ae77ab3a [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e69bfe6f9f7826f277875d729830e4009372470
 2021-02-02 23:29:48 +00:00
TreeHugger Robot
8541040e26 Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74fb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13369913

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49339a73e4267bcd34c4f35ca0bef1d77b874bf0
 2021-02-02 23:29:35 +00:00
TreeHugger Robot
146953dfff [automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours 
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 b7d4c8098d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2843e5d6ac13dc77185a4ab5647c521042656b57
 2021-02-02 23:28:19 +00:00