Commit Graph

122500 Commits

Author SHA1 Message Date
TreeHugger Robot
11cca623bd Merge "Remove unused listener" into udc-dev am: a99c64dfde am: a9bb4e14f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: Ic558a83d37bdf0207626014c26284e632231e377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 21:15:27 +00:00
TreeHugger Robot
3b74f7a188 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd am: 76932b5ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: Ic5000b6d94276c6306d20b4335389f9697f68ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:56 +00:00
TreeHugger Robot
93e48fba81 Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c am: 8838d8639d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Ifa3cb5a55134c0cf3cddd3390cd5b7884fb57e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:44 +00:00
TreeHugger Robot
a51fe0ff4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours am: b1f5565ee9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59375949c1ba858a8f79263e12a59f7942f174f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:33 +00:00
Yanting Yang
b519b0e167 Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88 am: 22b870bd7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650

Change-Id: I753345c33e9e6191c6ede535976364c0ad5d68ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:21 +00:00
TreeHugger Robot
73e2d7966e Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d am: b33294a11d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I07f8ae6e4db1dd9ff8d939af794d2c77fa8b7f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:10:06 +00:00
TreeHugger Robot
b2c6748179 Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 am: c321d9f1ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: I03ad67b4989bfa9ee3d8cf3bdfa42497117f7906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:09:52 +00:00
TreeHugger Robot
c5e120ff80 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 am: a18d8913c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: Idb9cf25d9c7cc484d9f1afb83bc416f075e291b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:09:18 +00:00
TreeHugger Robot
bf52934fe2 Merge "Remove unused listener" into udc-dev am: a99c64dfde am: 9a0c0d7a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: I3b627dc32e633776350f292c2bd1333bb96f894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:07:16 +00:00
TreeHugger Robot
a9bb4e14f0 Merge "Remove unused listener" into udc-dev am: a99c64dfde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: I4981fa9180b398f9dbb767e208a83db5461cf3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:58:45 +00:00
TreeHugger Robot
76932b5ee4 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I66a74e160ceae1b9a1df596584cf5454c7168605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:42:04 +00:00
TreeHugger Robot
8838d8639d Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Iebb07c483f4fb8af1bb278095136559c5dfa25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:41:51 +00:00
TreeHugger Robot
b1f5565ee9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d9e42ed34c1ea50c8b995e323c9c527cd04ef16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:41:41 +00:00
Yanting Yang
22b870bd7d Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650

Change-Id: Iaeea61f5f54a2ab5a2bca25a6520d00bbe726bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:41:33 +00:00
TreeHugger Robot
b33294a11d Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I32587c2a97c0487da46aac1b96d6bdc689db1322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:41:12 +00:00
TreeHugger Robot
c321d9f1ea Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: I6a59a7c1ea69576296c84759522965a3dda26e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:40:23 +00:00
TreeHugger Robot
a18d8913c7 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: I53382574cf5b7196dad573c91f70f791efcdc026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:40:12 +00:00
TreeHugger Robot
9a0c0d7a82 Merge "Remove unused listener" into udc-dev am: a99c64dfde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: Iea5199833d7ad7ae89c743371e420b70aa295ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:40:01 +00:00
TreeHugger Robot
98017dea10 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb am: 0edd4e2b9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: Id3163694efeb7f8778553e23ddff56268e0e354a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:39:54 +00:00
Bill Yi
c73b300ae0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours am: 5caf2a7e4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8518d345206546f3bd3a95d7c9e130e6779b302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:39:45 +00:00
TreeHugger Robot
aa3c7af656 Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 am: 2094e9d0c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I19bf2120bbb2dde29ebecd34059466168a5fef92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:16:06 +00:00
Bill Yi
d21633c3b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours am: 8452984341 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb6dd926cd9da9f3c7f29a62b64f27627d5a185e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:15:59 +00:00
TreeHugger Robot
4c5038ef03 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb am: bd81231f46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I2391b8895ce25181c1aa4072a978aa715151dcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:13:31 +00:00
Bill Yi
489004128e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours am: 093609c5d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc4f70fa7e64359b98efeb67e6d197b217572e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:13:19 +00:00
TreeHugger Robot
f27536a5cb Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 am: f7050b25ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: Ia44fc21e0cde0436206314ff6cbcb92213a5c9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:10:10 +00:00
Bill Yi
75f8001b89 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours am: 232d836205 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4dfd1d7dd8d5c981329c7a9617e7f3d3d8b387ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:10:02 +00:00
TreeHugger Robot
bd81231f46 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I40a13c28ce829406bd361c1d7fbcd23f288a46ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:00:03 +00:00
Bill Yi
093609c5d9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb4554d64f6344c701c109c3cb62d598891914c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:59:53 +00:00
TreeHugger Robot
0edd4e2b9a Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I3a41df3de7c9766aa1acf631e8db07dcfc823938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:45:13 +00:00
Bill Yi
5caf2a7e4e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99c5dff5d265acbfead5690311b9bfc3475a6679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:44:59 +00:00
TreeHugger Robot
f7050b25ee Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I234c37cf039b6ea2283ecb3275aa783a4213d205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:34:53 +00:00
Bill Yi
232d836205 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff384be9146717a2d09643aede4e40fc550f3f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:34:48 +00:00
TreeHugger Robot
89cc577adf Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 am: bc1ae98aaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: I90357816d0ea18c8042e6e9f8602c2c3f7fc0c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:27:55 +00:00
TreeHugger Robot
2094e9d0c2 Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I9d53109132363f5f8bcb3289461efb5abe79f413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:10:32 +00:00
Bill Yi
8452984341 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d4c3dfad42abb3a98bf9001cccef5f7766dc9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:10:30 +00:00
TreeHugger Robot
bc1ae98aaf Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: Icfb9ff53a6d6acf61c2303be1019e48d2ce84d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:29:29 +00:00
TreeHugger Robot
5d0b8031fd Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I7a12612e6aef131353d1dfbe2c8f4dd86d7b5b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:28:36 +00:00
TreeHugger Robot
d82f2eae5c Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: I3940fb8e1333d051d12ddb5001717d473bf89d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:18:01 +00:00
TreeHugger Robot
285dadae4e Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 am: 374d72f70c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: I1cc98a22f1b881bd87662b24a5c1201595bda9a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:57:21 +00:00
TreeHugger Robot
64aa2889d1 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:30:30 +00:00
TreeHugger Robot
b3599ae3b6 Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Ieb852ea9a7963f0407f7a78e38df0050085ffbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:30:11 +00:00
TreeHugger Robot
374d72f70c Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: Ia488c31773954f0bcbcc1a691ef303058e40ba12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:27:58 +00:00
TreeHugger Robot
d7b40a08fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26610f2a63c6e192822a93f76c0b20c2f06d787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:20:43 +00:00
Yanting Yang
bc12caac88 Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev 2023-03-30 15:13:16 +00:00
TreeHugger Robot
3d548d2f2d Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev 2023-03-30 15:01:42 +00:00
TreeHugger Robot
535fe83821 Merge "Fix checkcolor_hook error of Settings" into udc-dev 2023-03-30 14:18:11 +00:00
Yanting Yang
705872ada6 Fix checkcolor_hook error of Settings
Bug: 276273674
Test: verify with repo upload
Change-Id: Ia5ba89bb1b491785b953ba7909b3fa7528a0a636
2023-03-30 20:51:09 +08:00
TreeHugger Robot
d79985af18 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev 2023-03-30 12:39:25 +00:00
Zaiyue Xue
ff11b8e307 Exclude screen on time in battery usage page when the device is in charging.
Bug: 265751163
Fix: 265751163
Test: manual
Change-Id: I4ed71e1d6fad56a7cbfc9cd47ed4d791f45261ce
2023-03-30 20:23:33 +08:00
Yanting Yang
56e07c25b3 Fix the potential DOS issue for the Settings Apps page
The usage access permission of Settings app could be turned off by
starting the activity with USAGE_ACCESS_SETTINGS. Once the Settings app
loses the usage access permission, it will crash the Apps page which
depends on the usage to show recent apps. And this symptom will persist
even with device reboot.

To fix this vulnerability, we can add a package check in onCreate() to
avoid someone trying to start USAGE_ACCESS_SETTINGS with the Settings
package from third party apps.

Bug: 264260808
Test: Manually verify solution with the repro steps and also test the
normal visiting behavior.
Change-Id: If7cb0880e706369504e432b1f1104d06b1fcfa26

Change-Id: I70871aed763d14a79e474547c77c20a9677af6ff
2023-03-30 19:52:39 +08:00