PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,878 Commits 1 Branch 0 Tags
d24f4a3f54573a2b2562c6f98a6fb0d73c40612c
Commit Graph

103878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c6fcf4dd69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393

Change-Id: If536c05600e8c63286f3ca35e5526b3dd0179e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 06:10:54 +00:00
TreeHugger Robot
ad78b5a675 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
Oli Lan
5d23958f2a [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: 40ec6382a0 -s ours am: bb562d7426 -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: Ia834ccb8fe8912400f49b891dc12666acd59bb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:31 +00:00
Oli Lan
bb562d7426 [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: 40ec6382a0 -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: I07b0906b78784d42784afcc982973e916517b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00:00
Oli Lan
1dbf6b7d60 [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: 819430ed60 -s ours am: d3938dfc4c -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: Id581ae55b5a6ff4fc0d5c96b33ef58e8562215e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:33:17 +00: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
d3938dfc4c [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: 819430ed60 -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: Iecf56bfac38ff2dbc603a9f96f4f57add7de3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:47 +00:00
Oli Lan
819430ed60 [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: Iec95e74515918dd7a9c7c0598f88031ee58682d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:58:26 +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
Bill Yi
32ddcf7c21 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I39be64756b5d020673c662eb51e372997587ccc7
 2022-08-22 02:18:18 -07:00
Treehugger Robot
cdacabf984 Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:44:42 +00:00
Treehugger Robot
a89e7aea3b Merge "Fix array-related errorprone warnings" am: a93e78f781 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: I644d5974c31a216b360a2dc1d1b1c156f6288f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 19:25:27 +00:00
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:31 +00:00
Tsung-Mao Fang
5e785a2d99 Wi-Fi panel doesn't need to check permission 
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
 2022-08-17 02:43:03 +00:00
Xin Li
070c045837 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2186878

Change-Id: Ie78dba9efd64ed87c36577b4f705fb6eb102ebab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:30 +00:00
Xin Li
98c2ff5b3b [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2186878

Change-Id: I93435f94befbf09d289979ac46e97ca0cf83d9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:27 +00:00
Xin Li
c27f705eb7 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:11:14 +00:00
Xin Li
48b65ca561 DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
 2022-08-15 22:04:37 -07:00
Treehugger Robot
c50439e229 Merge "Remove luyota from OWNERS." am: dcd3081158 am: d3a358910b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: I4e704eb49210afd13f7c00841ad6b242988a3e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:57:05 +00:00
Treehugger Robot
d3a358910b Merge "Remove luyota from OWNERS." am: dcd3081158 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: Ibc32c7ab34a3006acca4f0edbb38645d2c6ecf9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:31:16 +00:00
Treehugger Robot
dcd3081158 Merge "Remove luyota from OWNERS." 2022-08-16 01:53:34 +00:00
Cole Faust
a21ac03acb Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
 2022-08-15 18:52:37 -07:00
TreeHugger Robot
fb1a655d43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: Icc9667b3aee16b4427d2cf6152f4681c22c80745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:31:33 +00:00
Bill Yi
fdc0cac006 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: I521168c647bdb9206bc761ab03400536e62b847f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:31:22 +00:00
Bill Yi
7e6afc5894 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357

Change-Id: I327cd9cef8cc65110a765c287df93689ca7bedda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:31:15 +00:00
TreeHugger Robot
e91b230bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: I8d9fe810fae9f907eaaee43681b54b047c2cedf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:01:35 +00:00
Bill Yi
9b8d62847e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: Iacfaa7a89d11000f8e5218661d404cad0e435795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:01:28 +00:00
Bill Yi
c64165dc4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606357

Change-Id: I08ee6f10b0daff666ef0100551f50405a59f3132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 04:01:17 +00:00
Bob Badour
2e005f4cec Remove luyota from OWNERS. 
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
 2022-08-12 19:57:37 +00:00
Bill Yi
a87c5a5641 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e5881a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19602317

Change-Id: I4393f4ae54b277c694110ace08d1a6ce48acbec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 19:04:44 +00:00
TreeHugger Robot
957768ce00 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:01 +00:00
Bill Yi
9d4bf7b223 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f852ef2312fc59d8aa1cb46ee7b04c33ec2b13f
 2022-08-12 07:30:07 -07:00
Bill Yi
0d14a19eee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3e12999c8049c46ebdc24abce1b01aa5bd90b103
 2022-08-12 07:26:23 -07:00
Treehugger Robot
2aa8cd1d1a Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: Ib7211f190336de2c318f117ebe2ab71ed5b35062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:20:59 +00:00
Treehugger Robot
e194aa42eb Merge "Fix permissions for internal links." am: 24f45fbd63 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:03:53 +00:00
Treehugger Robot
24f45fbd63 Merge "Fix permissions for internal links." 2022-08-12 02:44:31 +00:00
Bill Yi
9257e5881a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib173df0df75a70cfe0e675ed9507bf28916e7094
 2022-08-11 16:22:42 -07:00
Yuri Lin
fb4dc0b110 [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: 1d2a59d59c -s ours am: b93ced51af -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: I1796b82b8d3d5f4e2f5ce0750a263b98d7ef2815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:29:23 +00:00
Julia Reynolds
af8d9636a4 [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: 85e39e8997 -s ours am: 250f8e731b -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: Ibf6b410da84abc5ae96b25164daf64c00867e9d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:29:20 +00:00
Yuri Lin
ab049196f5 [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: cca0ff1d9a -s ours am: bb5fbb6520 -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: Ic790c9f8b3dacf2a8dec700813efa51565b7e0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:20:54 +00:00
Julia Reynolds
b8870fa40d [automerger skipped] Validate config activities with their rule owners am: b161a3b850 -s ours am: 812e171b1f -s ours am: fbcc4a9e52 -s ours am: 97316ad3b3 -s ours am: d5b6cb2eb0 -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: Ie1ed647abf58f8286381036486a7d4b661dec054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:20:53 +00:00
Yuri Lin
b93ced51af [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: 1d2a59d59c -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: Id043b2bcc5d7579b6cbd827648d6dc1b91a84899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:20:52 +00:00
Julia Reynolds
250f8e731b [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: 85e39e8997 -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: Idc87b834b3ed7d3a6d8913a073d1e8b2919758e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:20:47 +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