Commit Graph

111026 Commits

Author SHA1 Message Date
Arc Wang
3e121b1f94 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: dd4f2500b6 -s ours am: e7cf080484 -s ours
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244 is already in history

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

Change-Id: I418242cedb602f305de2d38b031c7c3557f5c850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 10:27:21 +00:00
Arc Wang
13e169b972 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49 -s ours am: 6d3f3af5d0 -s ours
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee is already in history

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

Change-Id: I0f1ed5ff1893fcf896c01f9af74fb9e4896ca937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 10:27:10 +00:00
Arc Wang
e7cf080484 [automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: dd4f2500b6 -s ours
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 95ff075244 is already in history

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

Change-Id: I90c89f36866a3c5ac44b4aa5f1bf7ca6562eeff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 09:44:26 +00:00
Arc Wang
6d3f3af5d0 [automerger skipped] Allow 2-pane deep link to access unexported Activity am: dc5a992f49 -s ours
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 f964b68fee is already in history

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

Change-Id: Idf5810ea235deb0c090695525f635232bfafddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 09:44:18 +00:00
Arc Wang
dd4f2500b6 Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211

Change-Id: I3d26e8d54ebf5ad307f58fb6119c89df33798356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 09:09:02 +00:00
Zoey Chen
c76250cd50 Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651

Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 07:04:37 +00:00
Zoey Chen
e99f20df58 Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev 2022-12-19 06:20:37 +00:00
Arc Wang
dc5a992f49 Allow 2-pane deep link to access unexported Activity
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.

Bug: 261678674
Bug: 250589026
Change-Id: I89b2ae49b3b13f29b0a02cd54291937241f61696
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 03:35:44 +00:00
Bill Yi
b0955301eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9020747917 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46fba36a7bcc8f6ba96375b2c9f08872bbd71f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 02:36:11 +00:00
Bill Yi
5a66983019 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d66bae69fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia769220dd82f6662552d7a998adfa8d7a8ac0e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17 02:35:51 +00:00
Bill Yi
9020747917 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-17 01:44:00 +00:00
Zoey Chen
e45ab97777 [Settings] Add search keywords for APN controller
Screenshot: https://hsv.googleplex.com/4816766300585984

Bug: 254024521
Test: atest ApnPreferenceController
Change-Id: I219256efff8d5859d029b190bf2cc73b8e83a746
2022-12-16 11:36:16 +00:00
YK Hung
ea082976a6 Merge "Move setup optimization mode to main thread" into tm-qpr-dev am: 3aca71cfc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742652

Change-Id: I78b78a50b032cacfa2ab4180e594018556d0377b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 05:25:05 +00:00
YK Hung
e7ec6ee025 Merge "Update dock defender helper URL" into tm-qpr-dev am: c89f78c68f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20742827

Change-Id: I7d3f436b5e7da6c380402014813d0233c55b0b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 05:24:33 +00:00
YK Hung
cf8ab7eef3 Merge "Update string for all defenders" into tm-qpr-dev am: d388dc1809
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20743066

Change-Id: I271e279c86e90360b9fae18f96dc8c913f9f430f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 05:23:35 +00:00
YK Hung
3aca71cfc2 Merge "Move setup optimization mode to main thread" into tm-qpr-dev 2022-12-16 04:53:06 +00:00
YK Hung
c89f78c68f Merge "Update dock defender helper URL" into tm-qpr-dev 2022-12-16 04:52:18 +00:00
YK Hung
d388dc1809 Merge "Update string for all defenders" into tm-qpr-dev 2022-12-16 04:51:46 +00:00
Treehugger Robot
691ddd7f07 Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" am: 8ac09942b6 am: a8abd64b73
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311766

Change-Id: I5d95061c4a22b21b003ffdc2272da8d15ab64b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 04:38:44 +00:00
Bill Yi
d66bae69fc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f902b8eb62ecf275d0b28869ee2fb7cad3c88e4
2022-12-15 20:33:51 -08:00
Treehugger Robot
a8abd64b73 Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" am: 8ac09942b6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311766

Change-Id: I232c7163792ffe2643c0706075ea49f3aa0841ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16 04:02:45 +00:00
Treehugger Robot
8ac09942b6 Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager" 2022-12-16 03:44:18 +00:00
William Xiao
26343e8926 Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709

Change-Id: I46a4c6300b2deb004417a78faaab25f10fd9ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 20:46:32 +00:00
William Xiao
0be191aeb7 Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev 2022-12-15 20:04:15 +00:00
Yuri Lin
de8a27b496 Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev am: dc4100f148
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20725886

Change-Id: I609c74ba96e7a32171ff20715d4aa8c68f8a68b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 16:51:30 +00:00
Yuri Lin
dc4100f148 Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev 2022-12-15 16:08:17 +00:00
Bill Yi
fdcb8480d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94f490d83c21235c9c500c4a6fa8c2659dbe87fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 14:30:47 +00:00
Bill Yi
58b243bd47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I769be6cbdc13dcca0e325bef5558ee3abc66b73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 14:30:12 +00:00
Bill Yi
0d848cb0ac Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-15 14:08:52 +00:00
Treehugger Robot
8a26d010d0 Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee am: 24835ea2f9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: Ie89e48f670b7e3cc8d8d607149d35c678b67ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 12:59:37 +00:00
Treehugger Robot
24835ea2f9 Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884

Change-Id: I5f73183e359038b48df0a83c4ce76c3dbc4cc42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 12:25:52 +00:00
Treehugger Robot
d03411f0ee Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" 2022-12-15 12:03:36 +00:00
Wesley Wang
d907a12980 Move setup optimization mode to main thread
- Due to unclear root cause of optimization mode being reset after
   reboot, update the setup logic from deferred background thread to
   main thread, to avoid any possible background task unexecuted case.

Bug: 241735485
Test: make SettingsRoboTests
Change-Id: I2de2181321712f89fadc04bf5000aea91a01485a
Merged-In: I2de2181321712f89fadc04bf5000aea91a01485a
(cherry picked from commit 7423f4390c)
2022-12-15 11:49:14 +00:00
Zhenwei Chen
35caf2ffb7 Update dock defender helper URL
Bug: 261206713
Test: Unit test passed
Change-Id: I6a8489b7e1a54d2c1d88cf6b04c8d1a4c9c6c235
2022-12-15 10:09:55 +00:00
TreeHugger Robot
e2fa501390 Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727250

Change-Id: I230322f17eb8335240e655e1d8af24776d82d6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 06:32:57 +00:00
TreeHugger Robot
8ccf48b0fc Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev 2022-12-15 06:06:22 +00:00
Zhenwei Chen
1eea27ae82 Update string for all defenders
Test: Unit test passed
Bug: 262508668
Change-Id: Ia0126f9761caa43d0746962a9bb77173e9f45ad1
2022-12-15 05:31:18 +00:00
Arc Wang
c743f44644 Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev am: e8e2d9c68f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20704230

Change-Id: Ic7b667e5d12c125769feabc0ac13f79eaafab771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15 05:16:14 +00:00
Arc Wang
e8e2d9c68f Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev 2022-12-15 04:23:13 +00:00
Arc Wang
0f7f913281 Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
To improve security, calling app must be granted Uri permission
if it sets FLAG_GRANT_READ/WRITE_URI_PERMISSION in the Intent of
ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY.

Bug: 250589026
Test: manual
Change-Id: I48f88c662b843212b1066369badff84cf98935a8
Merged-In: I48f88c662b843212b1066369badff84cf98935a8
2022-12-15 03:41:53 +00:00
Arc Wang
95ff075244 Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
To improve security, calling app must be granted Uri permission
if it sets FLAG_GRANT_READ/WRITE_URI_PERMISSION in the Intent of
ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY.

Bug: 250589026
Test: manual
Change-Id: I48f88c662b843212b1066369badff84cf98935a8
Merged-In: I48f88c662b843212b1066369badff84cf98935a8
2022-12-15 03:40:08 +00:00
Bill Yi
b66bdeb77f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I57333cf8b71834cba7ad120d25795998abc7cb9a
2022-12-14 12:52:47 -08:00
Yuri Lin
afe52dfae5 Disable zen rule preferences with invalid activities
While resolveActivity is used to determine whether an Intent can be handled by something, this doesn't catch the case of explicit intents whose activity class doesn't exist. Here we check for it through PackageManager.queryIntentActivities instead for existing zen rules (if they were added when the activity exists, but it no longer does).

For new rules, check the validity of the activity for external rules before adding them to the list.

Bug: 238144390
Test: manual via DND app
Change-Id: Ia920ca792f9c17a5d684baf877c882ce7fadffd6
2022-12-14 14:13:36 -05:00
Arc Wang
d1549f2243 Settings 2-pane deep link vulnerabilities
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
   start the deep link Activity.

Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
2022-12-14 11:59:57 +00:00
Arc Wang
0498907322 Allow 2-pane deep link to access unexported Activity
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.

Bug: 261678674
Bug: 250589026
Test: manual visual
      Launcher -> context menu -> Wallpaper & style
Change-Id: I662df6cb287361b135e2c596abe946ddeb03bda4
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
2022-12-14 19:17:40 +08:00
Jason Chiu
95c7c63fc1 Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev am: 0b0d8ace66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715247

Change-Id: I963a95fb9787778579a1c9a1a0237b84b4384a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 03:12:23 +00:00
Jason Chiu
0b0d8ace66 Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev 2022-12-14 02:49:58 +00:00
Diya Bera
c52d4922cc Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590

Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 21:37:51 +00:00
Diya Bera
2d343061d3 Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev 2022-12-13 21:15:08 +00:00
TreeHugger Robot
240835c715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41d2cb5a62ffa6d03e24dfb143a4816881be2494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:25:39 +00:00