Commit Graph

470553 Commits

Author SHA1 Message Date
Automerger Merge Worker
8155bf1a27 Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev am: 01f0e8f0c3 am: 1e39c517e9
Change-Id: I3e1bd754f3cb64b2a2a5e0e09fc19551bf0a4dbf
2020-02-28 22:43:54 +00:00
Automerger Merge Worker
1e39c517e9 Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev am: 01f0e8f0c3
Change-Id: I93e6176ffa04f37e9218230b7dc3622c479bf221
2020-02-28 22:32:56 +00:00
TreeHugger Robot
01f0e8f0c3 Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev 2020-02-28 22:16:45 +00:00
Automerger Merge Worker
6f91cc6320 [automerger skipped] Show toasts from system/sysUI to all users am: 0a7ced1dd3 am: d6ff4d4517 -s ours
am skip reason: Change-Id I227e9f74166300fcb3ba8f3871b464afe6ec6a28 with SHA-1 0a7ced1dd3 is in history

Change-Id: I75f8b50a54a0314876f76adab7c57ee4ac84506f
2020-02-28 21:55:06 +00:00
Automerger Merge Worker
76d4b2b801 Merge "Merge "Adding postsubmit tests for JobScheduler." into rvc-dev am: f9de0572fb am: 433eb479a2" into rvc-d1-dev-plus-aosp 2020-02-28 21:55:04 +00:00
Automerger Merge Worker
4f79e596cb Merge "Show toasts from system/sysUI to all users am: 0a7ced1dd3 am: 3ed9ce074f" into rvc-d1-dev-plus-aosp 2020-02-28 21:54:59 +00:00
Automerger Merge Worker
3694452897 Merge "Adding postsubmit tests for JobScheduler." into rvc-dev am: f9de0572fb am: 433eb479a2
Change-Id: I357318e7f695e56a1ddabc71c346e125b0f37b06
2020-02-28 21:54:59 +00:00
Automerger Merge Worker
accb0c6c0f Merge "Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10a5 am: a34b687c93" into rvc-d1-dev-plus-aosp 2020-02-28 21:54:55 +00:00
Automerger Merge Worker
74c5ae02a9 Show toasts from system/sysUI to all users am: 0a7ced1dd3 am: 3ed9ce074f
Change-Id: I0881b7a2ff1085f77d69e260ecf8c2db83e5d6e4
2020-02-28 21:54:54 +00:00
Automerger Merge Worker
19e6f0f5c1 Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10a5 am: a34b687c93
Change-Id: I32f132f56a6e1c20ea341b59f808fd365e132656
2020-02-28 21:54:48 +00:00
Automerger Merge Worker
dec2c68496 Merge "Adding postsubmit tests for JobScheduler." into rvc-dev am: f9de0572fb am: db7c01d2de
Change-Id: I51aaaa5c15670f00d460a77016c0320d3a8d5d8c
2020-02-28 21:54:45 +00:00
Automerger Merge Worker
f3ff369701 Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10a5 am: e34a4a1c52
Change-Id: I74e70ce1be7bf4ad77b693cfbdf429d33da47987
2020-02-28 21:54:35 +00:00
Automerger Merge Worker
f5fe23f0a0 Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev am: 2cba965676 am: bd1d7fb12a
Change-Id: I71bcae146d822b020c70583450bb593d6a5820dd
2020-02-28 21:54:27 +00:00
Automerger Merge Worker
2df89417f7 Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev am: 2cba965676 am: e76d531782
Change-Id: I757e11931a1fac2023047236d96ee7fe70dfa8eb
2020-02-28 21:54:16 +00:00
Automerger Merge Worker
d6ff4d4517 Show toasts from system/sysUI to all users am: 0a7ced1dd3
Change-Id: Iad91e5ecdad2f1ae542c69fe9d03e64ba39adc71
2020-02-28 21:44:37 +00:00
Automerger Merge Worker
3ed9ce074f Show toasts from system/sysUI to all users am: 0a7ced1dd3
Change-Id: Id6bd0067e58aac28785dd5748347a6a193b5a718
2020-02-28 21:44:25 +00:00
Automerger Merge Worker
433eb479a2 Merge "Adding postsubmit tests for JobScheduler." into rvc-dev am: f9de0572fb
Change-Id: I7520db8cc069d1de80836864a9660e0e2bc49cc9
2020-02-28 21:44:24 +00:00
Automerger Merge Worker
db7c01d2de Merge "Adding postsubmit tests for JobScheduler." into rvc-dev am: f9de0572fb
Change-Id: I4e5d8980d4155905ceba3c735f1a00796363775d
2020-02-28 21:44:11 +00:00
Automerger Merge Worker
a34b687c93 Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10a5
Change-Id: I1448c06792aa736d92d179a055e293548793a1d6
2020-02-28 21:44:03 +00:00
Automerger Merge Worker
e34a4a1c52 Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10a5
Change-Id: I6e7eb1fbb54105122b8ccf03fab088eb06f5e7ce
2020-02-28 21:44:00 +00:00
Automerger Merge Worker
bd1d7fb12a Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev am: 2cba965676
Change-Id: I775382a74e1f7b493984b470326986e34c772dc1
2020-02-28 21:43:25 +00:00
Automerger Merge Worker
e76d531782 Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev am: 2cba965676
Change-Id: Id5539446027f5889c38c883cd684909a88d9de28
2020-02-28 21:43:20 +00:00
Bernardo Rufino
0a7ced1dd3 Show toasts from system/sysUI to all users
The package name test is safe:
* If it's used by Toast class in an app, apps have access to layout
  params anyway via getWindowParams() and applied flag is already
  protected by INTERNAL_SYSTEM_WINDOW permission.
* If it's used by ToastUI class in sys UI on behalf of another app,
  sys UI is trusted domain and can't be messed up by another app. It
  also has INTERNAL_SYSTEM_WINDOW permission.

Bug: 149408635
Test: atest ToastUITest android.widget.cts.ToastTest
      android.widget.cts29.ToastTest android.server.wm.ToastTest
Test: Change phone to vibration/silent in secondary user and observe
      toast is displayed.

Change-Id: I227e9f74166300fcb3ba8f3871b464afe6ec6a28
Merged-In: I227e9f74166300fcb3ba8f3871b464afe6ec6a28
(cherry picked from commit caef507aa9)
2020-02-28 21:42:36 +00:00
TreeHugger Robot
f9de0572fb Merge "Adding postsubmit tests for JobScheduler." into rvc-dev 2020-02-28 21:41:56 +00:00
TreeHugger Robot
dae05e10a5 Merge "Add comments to messageId, subMessageId and data" into rvc-dev 2020-02-28 21:38:46 +00:00
Ytai Ben-tsvi
2cba965676 Merge "Pass models to soundtrigger middleware with shared memory" into rvc-dev 2020-02-28 21:29:53 +00:00
Automerger Merge Worker
2b8a0e63e2 [automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60 -s ours
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91a3 is in history

Change-Id: Id8dd0ec61c0b8b9b63439907b4f9c1d66513ecfe
2020-02-28 21:24:53 +00:00
Automerger Merge Worker
fb4711208f Merge "Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f" into rvc-d1-dev-plus-aosp 2020-02-28 21:24:28 +00:00
Automerger Merge Worker
6307b49aea Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: af7610e9c5
Change-Id: I8225719a750d3d3d023ee836c0825ffeb6141000
2020-02-28 21:24:15 +00:00
Automerger Merge Worker
a07e12a78e Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: eac4d861bd
Change-Id: I01ecd988a31b45bd289ceb52556460901c5467af
2020-02-28 21:24:07 +00:00
Automerger Merge Worker
e5e48132c0 Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f
Change-Id: I4455fbfef2fc68733e09b4be52dff4fb164362dd
2020-02-28 21:24:03 +00:00
Automerger Merge Worker
1e032b50b0 Merge changes from topic "am-f7705fa494054376a78941561e6b12e9" into rvc-d1-dev-plus-aosp
* changes:
  Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 398252d3a9
  LockSettingsService: move database storage am: a486e2d780 am: 2bdcfa062c
2020-02-28 21:24:01 +00:00
Automerger Merge Worker
5a4cff4d82 Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 398252d3a9
Change-Id: I779147eb5483fb35fa5bd1799d3de48df3244ef4
2020-02-28 21:23:57 +00:00
Automerger Merge Worker
d67d6afb83 LockSettingsService: move database storage am: a486e2d780 am: 2bdcfa062c
Change-Id: Ic8a69a36368054f81ea18c40fef336b59c840420
2020-02-28 21:23:55 +00:00
Automerger Merge Worker
2ad9603397 Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87
Change-Id: Ie346a99fc26bf01950616342e16b4ac7a1f30f76
2020-02-28 21:23:51 +00:00
Automerger Merge Worker
8c63ded41f LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66
Change-Id: I546fb53e4eb19e65146e28fc4b602ac9ecae5f3d
2020-02-28 21:23:48 +00:00
Automerger Merge Worker
af7610e9c5 Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d
Change-Id: I156fb0e9b6b703577873003f2350b6e640603d7c
2020-02-28 21:10:57 +00:00
Automerger Merge Worker
eac4d861bd Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d
Change-Id: I5d5b76e871d61aac3421ccbfab383c2596c12a98
2020-02-28 21:10:44 +00:00
Automerger Merge Worker
ce92347e60 Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d
Change-Id: I810c0a37d1f63280e11e2d3270032e0c7f45e7f0
2020-02-28 21:10:38 +00:00
Automerger Merge Worker
398252d3a9 Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf
Change-Id: Iff94b0c28936664b0aab13b47e6ebea54704795c
2020-02-28 21:10:27 +00:00
Automerger Merge Worker
2bdcfa062c LockSettingsService: move database storage am: a486e2d780
Change-Id: Ie0319a3be6be32793604397317de942d3d7139c2
2020-02-28 21:10:22 +00:00
Automerger Merge Worker
a438c3b63f Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d
Change-Id: I40a9993ebddd02d96ad3bf3cac92fcf251e95612
2020-02-28 21:10:20 +00:00
Automerger Merge Worker
333aa55f87 Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf
Change-Id: I2ec9c37c9d2ebbe8b1ea79f61cb32e5d7f0e4cc3
2020-02-28 21:10:10 +00:00
Automerger Merge Worker
e6fa66af66 LockSettingsService: move database storage am: a486e2d780
Change-Id: I51aff0ff4d1a77abb570a89ddbc6af3f740dc7a8
2020-02-28 21:10:08 +00:00
Bernardo Rufino
9b256a210d Merge "Unify toast presentation code" into rvc-dev 2020-02-28 21:09:36 +00:00
Rob Carr
228376091d Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev 2020-02-28 21:06:34 +00:00
Ytai Ben-Tsvi
d5065ba8a5 Pass models to soundtrigger middleware with shared memory
This both avoids the need to make extra copied for the models and
allows exceeding the parcel size limits.

Bug: 150100907
Test: Manual testing of basic sound trigger functionality
Change-Id: Ic4c5c1a9de3e29b1b6fa82442254e1afe7daec19
2020-02-28 13:01:24 -08:00
Kenny Root
3e5a0605cf Merge changes Ief1cac19,Ibc9236a1 into rvc-dev
* changes:
  Resume-on-Reboot: add storage for armed status
  LockSettingsService: move database storage
2020-02-28 20:49:29 +00:00
Kenny Root
ea134edcd5 Resume-on-Reboot: add storage for armed status
In order to avoid marking a manual reboot as a RoR failure, add another
indicator that the resume-on-reboot was armed before the last reboot.

(cherry picked from commit 5e6a959653)

Test: atest RebootEscrowManagerTests
Bug: 149833390
Change-Id: Ief1cac1952302e43a2c57314bc1449fa7bf38ba7
Merged-In: Ief1cac1952302e43a2c57314bc1449fa7bf38ba7
2020-02-28 20:48:46 +00:00
Kenny Root
a486e2d780 LockSettingsService: move database storage
The database storage commands are part of ILockSettings, but the actual
storage takes place on LockSettingsStorage. Redirect the calls in
LockSettingsService to LockSettingsStorage to make the ownership a bit
more clear.

(cherry picked from commit 366c310e4a)

Bug: 149833390
Test: atest LockSettingsStorageTests LockSettingsServiceTests
Change-Id: Ibc9236a171cedd3b09b1afed70895bc91e895a1c
Merged-In: Ibc9236a171cedd3b09b1afed70895bc91e895a1c
2020-02-28 20:48:13 +00:00