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

114193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a44044dfe6 Merge "Fix the header can't be scrolling problem in landscape mode" 2022-08-12 07:30:22 +00:00
TreeHugger Robot
9178137457 Merge "Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID" 2022-08-12 05:31:38 +00:00
Yanting Yang
b88d1b6e3c Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" 2022-08-12 05:24:06 +00:00
Treehugger Robot
25ffab4db6 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26 am: bf0cb88417 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

Change-Id: I342a1e0a403e8971eb69ae518a6b1aef125e6661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 04:22:48 +00:00
Treehugger Robot
bf0cb88417 Merge "Fix permissions for internal links." am: 24f45fbd63 am: e194aa42eb am: 2aa8cd1d1a am: 62fa667b26 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455

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

Change-Id: I49eb01dd9ecf0f6bb606c778bbd0acbc99b11a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:47:12 +00: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
d47e03e617 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094 am: 79bdae659c -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 e1f72b7f3c is already in history

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

Change-Id: Ib6388b2f24a3744b48b65ea4d1ebaf7a0c996864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 03:05:11 +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
79bdae659c Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev am: 0077129094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590401

Change-Id: Ic53e1282db41bf8c8c66e8d750179189b3b1af1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:46:52 +00:00
Treehugger Robot
24f45fbd63 Merge "Fix permissions for internal links." 2022-08-12 02:44:31 +00:00
TreeHugger Robot
0077129094 Merge "Wi-Fi panel doesn't need to check permission" into tm-qpr-dev 2022-08-12 02:27:36 +00:00
Betty Chang
b9abc156c8 Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde am: 0c2a3ead2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: I85e2d5a8589cf775ca2da2d79081eddbd9b59378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 02:24:02 +00:00
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
Betty Chang
0c2a3ead2b Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: Ia2f4ab79a90b7733d0ad23b3573b55a527da84df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 01:40:05 +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
Betty Chang
9c0904acde Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev 2022-08-12 01:29:01 +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
Yanting Yang
4356c9c653 Check DISALLOW_APPS_CONTROL before performing reset app preferences 
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.

The function of reset app preferences will re-enable the disabled apps,
it can let users bypass DISALLOW_APPS_CONTROL to enable an app disabled
by IT admin to see sensitive information.

To fix this vulnerability, we add a check for DISALLOW_APPS_CONTROL
restriction before users reset app preferences. Once the restriction is
enabled, it will show dialog “Blocked by your IT admin” instead.

Fixes: 238745070
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: Iffee73cf4952b686a78b4c7aaa54747971337d03
 2022-08-11 22:43:38 +08: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
Tsung-Mao Fang
a71907e873 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
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
 2022-08-11 12:21:08 +00:00
TreeHugger Robot
4ff741a059 Merge "Wi-Fi panel doesn't need to check permission" 2022-08-11 12:21:01 +00:00
Weng Su
2732be59e5 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID 
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
 2022-08-11 17:51:51 +08: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
Sunny Shao
151a088094 Fix the header can't be scrolling problem in landscape mode 
- Settings header is restricted scrolling by this ag/15029686
- To void some pages can't show the contain part while heading unscrolling.
  We allow the header can be scrolling in the landscape mode.

Fixes: 207353353
Test: make RunSettingsRoboTests -j
Change-Id: Ice97c6244716d4768167feb78588807d13b06a94
 2022-08-11 15:33:45 +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