PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,172 Commits 1 Branch 0 Tags
044887da8e6587d69d43c9d45e7e752ef57edbb6
Commit Graph

114172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
044887da8e Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb am: d208da6546 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: I815b5f1af564e64e73cbc352b7b1cd233bd64537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:23:35 +00:00
TreeHugger Robot
d208da6546 Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev am: 2cd733dcdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19553474

Change-Id: Ib8bb80d10095f4de2d14bbe4facd1534977e0b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 01:39:40 +00:00
TreeHugger Robot
2cd733dcdb Merge "Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-qpr-dev 2022-08-12 01:19:01 +00:00
Prabal Singh
8a932c81be Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31 am: 94e073ce33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: Id246345cc0366630a2e8a83b3b3e717e347cbd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 22:44:37 +00:00
Prabal Singh
94e073ce33 Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev am: aaa6f7ef31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19562169

Change-Id: I54cb53c03d3b56aef294f64d32d5666e671b4e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 22:18:31 +00:00
Prabal Singh
aaa6f7ef31 Merge "Hide work policy info if safety center is enabled" into tm-qpr-dev 2022-08-11 22:05:11 +00:00
Lauren Winston
89be5b0d46 Merge "Add a cursor preference to Accessibility Settings" 2022-08-11 15:37:16 +00:00
TreeHugger Robot
04facfda8b Merge "Fix "Notification to Allow Messages" dialog is not compatible with dark theme" 2022-08-11 12:29:40 +00:00
TreeHugger Robot
4ff741a059 Merge "Wi-Fi panel doesn't need to check permission" 2022-08-11 12:21:01 +00:00
Hugh Chen
07a4675429 Fix "Notification to Allow Messages" dialog is not compatible with dark theme 
Use @*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight
to fix dark theme problem.

Bug: 213617624
Test: manual visual
Change-Id: Id207db83e88afdef8b0d7720b4b9cf851cb8872d
 2022-08-11 09:37:23 +00:00
Tsung-Mao Fang
e1f72b7f3c 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 caller is set as 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 of list as our
calling package, then it could fail to pass
permission check since that package could not
a calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
this Wi-Fi Panel problem since Wi-Fi panel running
on settings process and also promise the security
issue at the same time.

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
 2022-08-11 16:07:42 +08:00
PETER LIANG
f688780076 Merge "The activity launch preference should align to the padding style of the main switch." 2022-08-11 06:16:45 +00:00
Automerger Merge Worker
26a161c554 [automerger skipped] Merge changes from topic "am-8f638df199f049eaa67710c826969673" into tm-d1-dev-plus-aosp am: f47a8322ee -s ours am: 8872cafc72 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: Ic20d6baa231f6054aa2b914b34eae9b6ba12d719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:42:12 +00:00
Yuri Lin
0d3e7e0847 [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: fb4dc0b110 -s ours am: fa7df1f6a7 -s ours am: 99016566db -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: I069292e2bafc35c8dd0c1807975662678fa292df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:42:11 +00:00
Automerger Merge Worker
7fb523bad7 [automerger skipped] Merge changes from topic "am-3a0f5f424d134071ada6a833ec758287" into tm-d1-dev-plus-aosp am: 6eb9764c93 -s ours am: d78c84704f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: I8e4ceb30892ab4e38a6a5852adbbe010b0f90893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:39:52 +00:00
Yuri Lin
0c0d220271 [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: 9ba444a214 -s ours am: 08bce367f9 -s ours am: c3f9b1a234 -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: Ic66f7223410c8a6f5dc16173b387d6b724e37734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:39:51 +00:00
Automerger Merge Worker
d377f94682 [automerger skipped] Merge changes from topic "am-c912ebbb4b2e4d4a989f68e5d69b4df0" into tm-d1-dev-plus-aosp am: 245a10ec00 -s ours am: 34da1ed85b -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: I7bf0ffdc5ebb066a54b1864335fad5cc329d64a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:37:49 +00:00
Yuri Lin
8250615739 [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: ab049196f5 -s ours am: 5f55e9da43 -s ours am: 99b4882c23 -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: I660f23d15d65618a620a47ae3a91f6c93a51c83c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:37:45 +00:00
Automerger Merge Worker
f1d1f0cd18 Merge changes from topic "am-f84f92b539a04047959e42e80b6a8093" into tm-qpr-dev-plus-aosp am: b76a039f6f -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: Ife407f00f26291985e8c8d36350fcd55219a0f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:35:22 +00:00
Yuri Lin
3e78f45242 [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: 9ba444a214 -s ours am: bb2aebbf5e -s ours am: 224613bd31 -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: I6d6f011439bf94871432342e0f72735ca5284aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:35:18 +00:00
Yuri Lin
c4fa281eb4 [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: 8072f24535 -s ours am: c43b7e806c -s ours am: 723f6c5bbf -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: I93d33aeac2d92c95e8990cd55a0ff06b55e99bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:32:15 +00:00
Julia Reynolds
453a306b2f [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: a584bb797f -s ours am: f9752e39f1 -s ours am: d74dacd961 -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: Icc07f724aa036fc1014ac9891b3ada26c4772dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:32:10 +00:00
Yuri Lin
34544eff0d [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: 8072f24535 -s ours am: 13a1663d27 -s ours am: ef5ecfeefb -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: I972febe91ec3bb34d4f4331b171e314c271d44ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:30:22 +00:00
Julia Reynolds
04395b38a2 [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: a584bb797f -s ours am: c8355630bc -s ours am: 7d1e80fc4e -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: I07c4604b0f868cf7b2ac28960a8ca9ee6842561d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:30:20 +00:00
Automerger Merge Worker
8872cafc72 Merge changes from topic "am-8f638df199f049eaa67710c826969673" into tm-d1-dev-plus-aosp am: f47a8322ee -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: I65bd0e4f4d596f952a3f24b175f006fe4179124e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:12:46 +00:00
Yuri Lin
99016566db [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: fb4dc0b110 -s ours am: fa7df1f6a7 -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: I01b6f2d5da8862dae951052f571a8dc867956e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:12:44 +00:00
Automerger Merge Worker
d78c84704f Merge changes from topic "am-3a0f5f424d134071ada6a833ec758287" into tm-d1-dev-plus-aosp am: 6eb9764c93 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: I4f20a264b2d374a9be177bab06877eaa077937a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:11:28 +00:00
Yuri Lin
c3f9b1a234 [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: 9ba444a214 -s ours am: 08bce367f9 -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: I062d98483f25169ba1c1e1764a3ead99be1b1d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:11:23 +00:00
Automerger Merge Worker
34da1ed85b Merge changes from topic "am-c912ebbb4b2e4d4a989f68e5d69b4df0" into tm-d1-dev-plus-aosp am: 245a10ec00 -s ours 
am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b850 is already in history

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

Change-Id: I4fc0ea767c95d24f91f1fee35512b6329eda3729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:05:47 +00:00
Yuri Lin
99b4882c23 [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: ab049196f5 -s ours am: 5f55e9da43 -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: I7ee6340b5211309e6990d20af552008efda06a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:05:43 +00:00
Automerger Merge Worker
b76a039f6f Merge changes from topic "am-f84f92b539a04047959e42e80b6a8093" into tm-qpr-dev-plus-aosp 
* changes:
  [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: 9ba444a214 -s ours am: bb2aebbf5e -s ours
  [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: d07fc49ee3 -s ours am: 70c15cf76b -s ours
 2022-08-11 05:04:54 +00:00
Yuri Lin
224613bd31 [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: 9ba444a214 -s ours am: bb2aebbf5e -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: I54d5e2a3ec72c89a273e2bc8ad528d387b4de0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:03:57 +00:00
Julia Reynolds
40a2bc851f [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: d07fc49ee3 -s ours am: 70c15cf76b -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: I4fa2fe0e0e378e4ec8ba24f2f8f161185bc1b9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:03:56 +00:00
Yuri Lin
723f6c5bbf [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: 8072f24535 -s ours am: c43b7e806c -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: Ib5365aff5565e3adc15cef3e6a1cfe957cc1d44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:03:51 +00:00
Julia Reynolds
d74dacd961 [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: a584bb797f -s ours am: f9752e39f1 -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: I201c17425e1f30c8930432289207beedbe2f7b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:03:49 +00:00
Yuri Lin
ef5ecfeefb [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: 8072f24535 -s ours am: 13a1663d27 -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: I7619ea888907e8ebce5abc2a64ba9a91223d86f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:03:00 +00:00
Julia Reynolds
7d1e80fc4e [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: a584bb797f -s ours am: c8355630bc -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: I3b19373fc2e958faf1274aadb8dcb906dab78c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 05:02:56 +00:00
Automerger Merge Worker
f47a8322ee Merge changes from topic "am-8f638df199f049eaa67710c826969673" into tm-d1-dev-plus-aosp 
* changes:
  [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: fb4dc0b110 -s ours
  [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: af8d9636a4 -s ours
 2022-08-11 04:42:46 +00:00
Yuri Lin
fa7df1f6a7 [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: fb4dc0b110 -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: Iea30fb8a4a921f0ee143ff3d8408d89a70ed65a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:41:39 +00:00
Julia Reynolds
499455e00d [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: af8d9636a4 -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: I08e45f224c8dc6570a1ce2660475808c2ff1b0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:41:36 +00:00
Automerger Merge Worker
6eb9764c93 Merge changes from topic "am-3a0f5f424d134071ada6a833ec758287" into tm-d1-dev-plus-aosp 
* changes:
  [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: 9ba444a214 -s ours
  [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: d07fc49ee3 -s ours
 2022-08-11 04:41:21 +00:00
Automerger Merge Worker
245a10ec00 Merge changes from topic "am-c912ebbb4b2e4d4a989f68e5d69b4df0" into tm-d1-dev-plus-aosp 
* changes:
  [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: ab049196f5 -s ours
  [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: b8870fa40d -s ours
 2022-08-11 04:41:02 +00:00
Yuri Lin
08bce367f9 [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: 9ba444a214 -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: Ice696b7192d40b0beb318684a516d810997920d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:57 +00:00
Julia Reynolds
53066cc42c [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: d07fc49ee3 -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: I6bf708b9d619bfe92ae840a72df4efa9e2711ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:56 +00:00
Yuri Lin
bb2aebbf5e [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: 9ba444a214 -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: Ieb0f2e740d7178d5b08ec931e9485bb39267e012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:34 +00:00
Yuri Lin
a75338904a [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: 3ee8f35c93 -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: Ia201cae11a85e7efb118dfd7ed626f0972f8ac11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:33 +00:00
Julia Reynolds
70c15cf76b [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: d07fc49ee3 -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: I537fab16ff1697ec4057560f806afede3958460d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:33 +00:00
Julia Reynolds
ab865debb1 [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: dc2a456b5e -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: Ib93504649dc3742e127f552f083920ccd28a18ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:31 +00:00
Yuri Lin
5f55e9da43 [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: ab049196f5 -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: I984f7c4e2dd5ecef38cc573a93648db5b30fefa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:18 +00:00
Yuri Lin
c43b7e806c [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: 8072f24535 -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: Ia38df0ccc48c49dd5fc549579542e6afa099e47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 04:40:17 +00:00