changbetty
990c3d2a45
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419568
Change-Id: I09f8da9647990cadb9b28f741f2f30e2d70ad783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:41:08 +00:00
changbetty
8f412f14d2
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569
Change-Id: Ibb68644054e0b89f512a9540958a588a92194443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 03:39:36 +00:00
changbetty
c55c060361
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:39:29 +00:00
changbetty
e644704bee
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:39:16 +00:00
changbetty
31fb7bd480
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:38:23 +00:00
changbetty
fecf464fb4
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:37:57 +00:00
changbetty
3cc8db3c58
RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
...
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk
Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
2022-11-09 06:37:27 +00:00
Arc Wang
dd7d2d766a
Remove Intent selector from 2-pane deep link Intent
...
To guard against the arbitrary Intent injection through Selector.
Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I76fbf3ff7a6611ebb3d07f73845a64efe1771769
Merged-In: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
2022-11-02 07:38:18 +00:00
TreeHugger Robot
785e311159
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:27 +00:00
TreeHugger Robot
80f5fd3836
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
...
* changes:
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
Milton Wu
5561341091
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:15 +00:00
Milton Wu
27bddff2ac
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 07:00:35 +00:00
Milton Wu
d5771108b9
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 06:59:11 +00:00
Milton Wu
3f02770332
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Bug: 179725730
Change-Id: If1f5f223ce35e9eb7d038523dd663c8849426070
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-09-15 06:57:50 +00:00
Milton Wu
98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 06:57:35 +00:00
Oli Lan
ff1de3711e
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 11484d510a
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ie0f4cc27e8ad3987f120a8c13ca033cc17972e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:54:20 +00:00
Oli Lan
11484d510a
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ifa1eb07ec9264ea159064776d27c2fa2d2aeb1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:24:56 +00:00
Oli Lan
52f5f2ee31
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:01:32 +00:00
Oli Lan
f70e351d1a
Prevent exfiltration of system files via avatar picker.
...
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.
The mitigations are:
1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.
2) Only allow a system handler to respond to the CROP intent.
This is a fixed version of ag/17003629, to address b/239513606.
Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
2022-08-26 19:46:02 +01:00
Oli Lan
40ec6382a0
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours am: 141dc63796
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I4db81a26ef2ede09401e576c6fc5afeb57d48291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 16:16:49 +00:00
Oli Lan
141dc63796
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours am: 48046cf4ae
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ic969ff87d67009c3737c74f950966f19772f3269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:57:47 +00:00
Oli Lan
48046cf4ae
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
am: e2815b7e11
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:39:22 +00:00
Oli Lan
e2815b7e11
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
am: 03b1a52977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I017c55ae2e7770bd52f1daca54e2aed7be05cb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:21:18 +00:00
Oli Lan
03b1a52977
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
am: 05031cc574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5a78c2328f8c68fb5bf15799a69479a82b8e7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:03:51 +00:00
Oli Lan
05031cc574
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Icfcf27040f9402b736306cf19178feee9f2a774b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 14:46:20 +00:00
Oli Lan
b9bafa0d3d
Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev
2022-08-22 14:27:57 +00:00
Yuri Lin
1d2a59d59c
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours am: 32e60479ca
-s ours am: d1c0e2151c
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I2661f108a341bf03c683f3859e36ae532263c4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:42:08 +00:00
Julia Reynolds
85e39e8997
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours am: fbcc4a9e52
-s ours am: 8e4337e37c
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I402f225ed9b2ae42d3b293e28a6ff42cd8d4ab53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:42:04 +00:00
Yuri Lin
d1c0e2151c
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours am: 32e60479ca
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I730cfb1b9593bcc4185d2effa5c474600e274bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:17:38 +00:00
Julia Reynolds
8e4337e37c
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours am: fbcc4a9e52
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I1ab75fd0ccf2a320ba0b3a0325273694eec7b2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:17:37 +00:00
Yuri Lin
32e60479ca
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours am: 25aa1f617d
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I168125b60128b83e614aa6b19bdddfc093b00978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:51:30 +00:00
Julia Reynolds
fbcc4a9e52
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours am: 812e171b1f
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I11ec899513899e3dd48a434762745451077ab372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:51:28 +00:00
Yuri Lin
25aa1f617d
[automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I336ef4ab58d8c2cf31e857c49fd6ed88375796f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:26:09 +00:00
Julia Reynolds
812e171b1f
[automerger skipped] Validate config activities with their rule owners am: b161a3b850
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 65b18b5e69
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19199038
Change-Id: I7b2266a5461935660c1eb59965d5b3ddfd5b54af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 02:26:05 +00:00
Yuri Lin
316cd96b28
Merge "Validate config activities with their rule owners" into rvc-dev
2022-08-11 01:32:32 +00:00
Julia Reynolds
43738f40fc
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours am: 8badd7a6a4
-s ours am: 7cb32cee36
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ib41bb9e855d6aa34190505510ff70e3bbf743ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 00:57:39 +00:00
Julia Reynolds
7cb32cee36
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours am: 8badd7a6a4
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: I00ddbb23e1ba526fb53716fa3a31cb40fd22bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 00:33:43 +00:00
Julia Reynolds
8badd7a6a4
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours am: 8355374ddb
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ic38c5cbf072f80ce3fe323dde9c960e36659f847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 23:34:12 +00:00
Julia Reynolds
8355374ddb
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours am: 8fada38f9e
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Ief88df7619d8fa00cdf9a9c7a64bdb422bdeab47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 23:01:01 +00:00
Julia Reynolds
8fada38f9e
[automerger skipped] Validate config activities with their rule owners am: 65b18b5e69
am: cc3edfd2c7
-s ours
...
am skip reason: skipped by user yurilin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: Id6c1135838a71faecce17ba959a2dcccb0a8cbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 22:20:44 +00:00
Julia Reynolds
25a49730f4
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours am: 42e9a0cf0d
-s ours am: 541f64ddfb
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: Ic674c116e818bdfd09393048a400a766a77f8c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:50:10 +00:00
Julia Reynolds
cc3edfd2c7
Validate config activities with their rule owners am: 65b18b5e69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194215
Change-Id: I844f7e5eeefced63bca9d9baf7b41d1f9b7ac277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:26:47 +00:00
Julia Reynolds
541f64ddfb
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours am: 42e9a0cf0d
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: I8c9a0036519c37474da516184f0b1a8503c389bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 21:26:13 +00:00
Julia Reynolds
42e9a0cf0d
[automerger skipped] Validate config activities with their rule owners am: 59ca26589e
-s ours
...
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 393134f9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19196721
Change-Id: Ida93487ec0bd4a6bf25b93a1dd990f9d10f23fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 20:53:46 +00:00
Julia Reynolds
59ca26589e
Validate config activities with their rule owners
...
Test: RoboTests
Bug: 189332346
Bug: 235823407
Change-Id: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
Merged-In: Iee1b1caca4d6eb2729feb872c3e4954b6c16519c
2022-08-10 14:20:54 +00:00
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