Julia Reynolds
b161a3b850
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:20:22 +00:00
Julia Reynolds
65b18b5e69
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:19:14 +00:00
TreeHugger Robot
88f6533667
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-08-09 07:10:47 +00:00
TreeHugger Robot
4dd6ed1153
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-08-09 07:10:47 +00:00
Himanshu Rawat
61482c425e
Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651
Change-Id: I71ca4f0c9ab8e37c63ecd21783714488c27bbd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-09 07:04:58 +00:00
Himanshu Rawat
f073d27097
Merge "Don't cancel passkey entry pairing autonomously" into tm-dev
2022-08-09 06:42:00 +00:00
Bill Yi
a3491642be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I1dd9b048f034497cce8670ca8239a21243020590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:15 +00:00
Bill Yi
aa646b64f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I3c53da65aca139dc47e2204589553da16360189e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:07 +00:00
Bill Yi
52d877f6f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I236896268c7fea5cdc506165ad1ea0b294323360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:14:56 +00:00
Bill Yi
aba6baf22b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: Id55af5bfe5dbef6605fb6972ffaf10513e3b3bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:14:38 +00:00
Bill Yi
34848403ec
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-08 13:45:51 +00:00
Bill Yi
83da16166c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-08 13:45:51 +00:00
TreeHugger Robot
357de9f453
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours am: 8c14b68114
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: Iff759e9552ac79ae86002123af16168a53e2aeb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:40:32 +00:00
TreeHugger Robot
8c14b68114
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I4cb5761fe5ccb02d3ff3a18a0506ec53a2f911c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:56 +00:00
TreeHugger Robot
6897e89ae3
Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I1b7f5ca489c3e9dfeeab7ce1f2fab8298e8903e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:14 +00:00
Bill Yi
0454963189
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: If828bf934921d6b90131b67429447d33cf835d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:10 +00:00
Bill Yi
4a3e4af52b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: Ia593045d0cad75dc5d9374305b9ba44f5970e21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:02 +00:00
TreeHugger Robot
074ee502db
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-08 06:15:46 +00:00
TreeHugger Robot
4b5e98636d
Merge changes from topic "tc_change_22080720_11" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
Import translations. DO NOT MERGE ANYWHERE
2022-08-08 06:15:46 +00:00
Bill Yi
b53a13a2e0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
2022-08-08 03:46:19 +00:00
Bill Yi
f018579680
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
2022-08-07 16:16:19 -07:00
Bill Yi
f52497bd40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f0b461048e49766d3810c8b40962610084d47ad
2022-08-07 00:01:02 -07:00
Bill Yi
272619ebfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92ca6c87d1e88a3c3306934df34891cc0af31813
2022-08-06 23:53:07 -07:00
Bill Yi
0476afd502
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I033876f448bc48999e8f23ecd84878e4579af8bd
2022-08-06 23:49:57 -07:00
Bill Yi
935231bb97
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib47d9c013d2a1623f79b1438331154bdb25fc56b
2022-08-06 23:45:43 -07:00
Bill Yi
854e4b5ebc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I2cf759a22c20dcbe6701d600457dbd375bdd6b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:42 +00:00
Bill Yi
19ea488dcc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Ice25aff9ab1beaab4a272623928f706427c58186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:18:21 +00:00
TreeHugger Robot
e7ed387c64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Icf7becbb1e40a8f84672dd0c5de94d90dad919a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:59 +00:00
Bill Yi
b4a0efb06a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: If76e6d00a14bcc5d93af30dbab2068616c901859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:57 +00:00
Bill Yi
fa489fd82f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I1aeba934fd08e0b1f68c17f3403c9ba883547e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:56 +00:00
TreeHugger Robot
48224eca28
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-07 04:54:21 +00:00
Bill Yi
81b949bbd0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2dcbbf96274099824349e6469e0d9ff80e2a6a69
2022-08-04 02:12:16 -07:00
Bill Yi
444ead6a2e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6da0818ca33daaf08bf8f6d3f508d594d32a519a
2022-08-04 01:32:29 -07:00
Bill Yi
72fe892fc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6cd9698629063b3c10f043f57a0e5b3df6780a8c
2022-08-04 01:19:33 -07:00
Bill Yi
658d1cfd1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1800bfc93af5e569ebbb5fa4d1eb81fa41e5d4ba
2022-08-04 01:14:22 -07:00
Oli Lan
c0742e745d
Revert "Prevent exfiltration of system files via user image settings."
...
This reverts commit 8950a90024
.
Reason for revert: regression if multiple crop system crop handlers are present
Change-Id: Ib83dbb2f1109d26b7e85192379291bffef187e77
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-07-28 12:14:14 +00:00
Himanshu Rawat
d668a888f0
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:18 +00:00
TreeHugger Robot
058c5b262d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: Idf4ebe6c75e3eafc84d427e0b1fdcb993d3e2b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:52 +00:00
Bill Yi
58514f6237
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I0765afe183b2738d97db0615d6cd0eb58e303ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:34 +00:00
TreeHugger Robot
96bc6ca196
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-23 01:56:10 +00:00
Bill Yi
f49b1b5f37
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I785f54b2a769a3ea0ba764e412efc92dc28eeb6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:34:12 +00:00
TreeHugger Robot
5a4cfeab80
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-23 00:36:04 +00:00
Bill Yi
011d462ac4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
2022-07-22 16:58:27 +00:00
Bill Yi
babd7f1cc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
2022-07-21 23:10:10 -07:00
Bill Yi
3392372f5e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I610afd8792f9e1421017ab2fcb8bd2ebb96c44a8
2022-07-21 22:55:39 -07:00
Bill Yi
f2fa4aa6ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I68b14683469402cf3994e300e6fe329946e63826
2022-07-21 22:52:05 -07:00
Bill Yi
2d0fd7f558
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
2022-07-21 20:01:30 -07:00
TreeHugger Robot
62471e32ba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-07-17 18:06:57 +00:00