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
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
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
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
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
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
Bill Yi
2c7ca303ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae
-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: I44b33cf33b581726795713834e56a6cf15ca5415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 20:25:07 +00:00
TreeHugger Robot
47302fda11
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-13 19:49:15 +00:00
Diya Bera
6b468377c1
Flicker in Fingerprint Enrollment
...
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
Merged-in: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
2022-12-13 18:17:23 +00:00
Yi Jiang
7075fd453d
Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20696311
Change-Id: I8fb334d8ac3783286c3cce1df3bd5d2c83a92c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 17:06:07 +00:00
Yi Jiang
410c1d28bf
Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev
2022-12-13 16:27:35 +00:00
Arc Wang
f964b68fee
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-13 15:41:36 +08:00
William Xiao
ea655e9695
Default to timing out to dock user in 1 minute
...
Previous default was to disable the feature.
Bug: 260123067
Test: verified locally on device that the default is 1 minute for a new
user
Change-Id: I8f577d62b729eb1c1a0579a7b4eb6b50f7f7f0d8
2022-12-12 18:36:30 -08:00
Jason Chiu
55b17eb3fb
Fix IllegalArgumentException from RecyclerView in PanelFragment
...
The crash happens while RecyclerView is doing animation stuff. However,
The panel doesn't use any animation in the list, so the simplest
solution is to disable the ItemAnimator completely.
Fix: 260923012
Test: build
Change-Id: I9c5159366aca448a1075bee32ce940fbf902a450
2022-12-13 10:35:40 +08:00
Arc Wang
a538747a6a
Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154
Change-Id: I7acafe30f3cccfb2cf1428493f5cee42c5e8e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 02:07:35 +00:00
Arc Wang
a0e5f09d94
Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev
2022-12-13 01:19:06 +00:00
Bill Yi
4453455aae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I351b7072bcfca6b3bc3808c49290cdd9ef120670
2022-12-12 16:59:11 -08:00
Yi Jiang
1145b26ac7
Creates a flag for auto-rotate with face detection
...
The flag is enabled by default. And will be disabled on foldable
devices.
Test: locally
Bug: 236249360
Change-Id: I8c90533f6011531a4f00af5f2514579638604067
2022-12-12 19:49:16 +00:00
Darrell Shi
ef4fb09916
Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706
Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-12 17:01:34 +00:00
Darrell Shi
7bae5625a6
Merge "Update screensaver preference summary when on." into tm-qpr-dev
2022-12-12 16:41:38 +00:00
Shen Lin
f677ee600a
Align SETTINGS_PACKAGE_NAME reference to a single place
...
This CL migrated some fragmented declarations of Settings packageName.
When we want to referece package name of Settings, we prefer using
Utils#SETTINGS_PACKAGE_NAME.
Bug: 262123382
Test: make Settings -j64
Change-Id: Ice6afd993d5991bb3c50f676c637b9a5487261f7
2022-12-12 04:56:28 +00:00
Weng Su
cd486c06d0
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d
am: ee773103f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743
Change-Id: I3538fe496c4a5fd5e34d6cb066a8aaab132c2967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 09:16:22 +00:00
Weng Su
ee773103f8
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743
Change-Id: I6b1d18248dc3026bda0e02e1d43fc350f1e9a680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 08:44:09 +00:00
Weng Su
956f288d1d
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue"
2022-12-10 08:11:40 +00:00
Automerger Merge Worker
99c0b8baf6
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I8a220494d03397eab1e2076c27ee15ab8a96c99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 01:59:33 +00:00
Xin Li
bd7e05c797
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours am: 06b6887d64
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I3d36ea91eb5b79ce1a62d2a4b7ca0d8c2ec6b293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 01:57:13 +00:00
Xin Li
f63f3c682d
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours am: ef13057b38
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: Ic3dcfca9dfd8b0507f02b46c0396fd7134c76875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 00:26:58 +00:00
Xin Li
862a28bbfe
[automerger skipped] Merge Android 13 QPR1 am: ea401a8bba
-s ours am: 61084112c8
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I8b47aa9d46c1f9abe02ac9df009921564231c6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 00:24:34 +00:00
TreeHugger Robot
e33c25fdfb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20678239
Change-Id: I2cd665e51597b3175ca4f463234c60d547c0fdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:44:43 +00:00
Bill Yi
e7a29cb4de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20678239
Change-Id: I32f4f86b3c67f0f70090a60988493305b65565e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:44:07 +00:00