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
d47234fb7d
Merge "Remove unused strings."
2022-12-16 04:00:00 +00:00
Treehugger Robot
8ac09942b6
Merge "Override onTrimMemory to apply trimMemory in AppIconCacheManager"
2022-12-16 03:44:18 +00:00
Zaiyue Xue
bce700f1db
Refactor getting allowlist set from feature provider.
...
(1) Use Set<CharSequence> for all the allowlists.
(2) The contains() method of Set<CharSequence> also works for String. No
need an extra contains() util function.
Bug: 262802531
Fix: 262802531
Test: presubmit
Change-Id: Ib2aaf9a3b8db4618a8c46f138e8d35f15b77c104
2022-12-16 10:39:26 +08:00
Bill Yi
f164782792
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-16 02:18:14 +00:00
Bill Yi
67bd2277c7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-16 02:18:14 +00:00
Bonian Chen
6d57edf9ac
Merge "[Settings] Change network reset into reset mobile network"
2022-12-16 00:41:16 +00:00
William Xiao
71ee3c3a5d
Merge "Default to timing out to dock user in 1 minute" into tm-qpr-dev am: 0be191aeb7
am: 26343e8926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683709
Change-Id: I63dedfa49ec3d7c64c156d6a5da33772abfcc4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 00:04:15 +00:00
Yuri Lin
5db22756e4
Merge "Disable zen rule preferences with invalid activities" into tm-qpr-dev am: dc4100f148
am: de8a27b496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20725886
Change-Id: I4c0309a1b5773d6d92c0f43ba631571e2b375e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 00:00:17 +00:00
Bill Yi
5f08e8ace3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0d848cb0ac
-s ours am: fdcb8480d5
-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: I35b03d27edbd36f305f6cf1d138c5910f16d590d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:31 +00:00
Bill Yi
d00fdfc8ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b66bdeb77f
-s ours am: 58b243bd47
-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: Iacb436e70a856583b8e65fb8d848dc5ba48aabef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 23:15:00 +00:00
Eric Biggers
5f1d894252
Remove EncryptionInterstitial for Full Disk Encryption
...
Support for Full Disk Encryption was removed in Android 13, since now
File Based Encryption is always used instead. It turns out that I
missed a fairly large chunk of obsolete code: EncryptionInterstitial,
which is the screen that asks whether the device will require the
primary user's lockscreen credential when it starts up. This used to be
shown when setting the primary user's lockscreen credential, to
determine whether the full-disk encryption key would be tied to that
lockscreen credential or not. But now it's unused code.
This CL removes all this unused code.
This should not change any behavior, with one very minor exception:
Settings will no longer explicitly set the REQUIRE_PASSWORD_TO_DECRYPT
setting to 0 whenever the primary user's lockscreen credential is
changed. (This happened in SaveChosenLockWorkerBase.) This setting is
a @SystemApi, but it no longer has any meaning, since it is never set to
1 anymore. If there is a reason to keep it explicitly set to 0, instead
of unset, we should make LockSettingsService in system_server set it.
Test: Went through SUW, set a PIN, cleared the PIN, set a PIN again (all
using the UI). Nothing unusual seen.
Bug: 208476087
Change-Id: I039cc7a284e3f43e1e284970a5869958c909d1b7
2022-12-15 20:47:20 +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
Florian Mayer
2be085005b
Merge "[MTE] allow device policy to control setting"
2022-12-15 18:40:14 +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
Bonian Chen
8d43fd9a35
[Settings] Change network reset into reset mobile network
...
Replace reset network into Reset mobile network settings
Bug: 260034791
Test: local and auto
Change-Id: I9547f266c1586073fd2b96f35cc9df8861b0a105
2022-12-15 15:44:08 +00:00
Weng Su
28791f5ff0
Safely remove Wi-Fi user credentials
...
- Show "(In use)" if a credential is used by Wi-Fi networks
- Show Wi-Fi networks in use in the details dialog
- Disable "Uninstall" button if the credential is in use
Bug: 258542666
Test: manual test
atest -c UserCredentialsSettingsTest
Change-Id: I1fb29b58698d918f987b9a16c195127cf270c17e
2022-12-15 15:20:43 +00:00
Weng Su
ae8389165a
Create Helper Classes for WifiTrackerLib
...
- Create a WifiTrackerBase for the base worker thread
- Create a SavedWifiHelper for the saved Wi-Fi network tracker
Bug: 258542666
Test: manual test
atest -c WifiTrackerBaseTest \
SavedWifiHelperTest
Change-Id: Ie6b2f5b348367376da96737acdf5b8e65ecaf067
2022-12-15 15:19:47 +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
2f96743835
Merge "Align SETTINGS_PACKAGE_NAME reference to a single place" am: d03411f0ee
am: 24835ea2f9
am: 8a26d010d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2340884
Change-Id: I6b4edd0be16e090b56b628af51a0558c87822ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 13:41:13 +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
YK Hung
e047b4f400
Merge "Move setup optimization mode to main thread"
2022-12-15 10:56:09 +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
Edgar Wang
6e0ac2699e
Merge "Fix NPE crash in MainClearConfirm"
2022-12-15 09:27:46 +00:00
Edgar Wang
dc5158a505
Remove unused strings.
...
Change-Id: I832a11a55a531b40106c9f9a622ca1dd2fb9aaae
Test: rebuild
2022-12-15 09:27:31 +00:00
TreeHugger Robot
87498a19e6
Merge "Add a new field elapsed_time_millis into Settings' atom"
2022-12-15 09:17:47 +00:00
TreeHugger Robot
abe7e28a1e
[automerger skipped] Merge "Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION" into tm-qpr-dev am: 8ccf48b0fc
am: e2fa501390
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0c18e8990c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727250
Change-Id: I8e163226958eb0812315eee9cb705b05106a5bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 07:10:46 +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
Kuan Wang
6c4f83f33d
Load app usage events data in the hourly job.
...
Test: make RunSettingsRoboTests + manual
Bug: 260964679
Change-Id: Iaccaa77bd52fb7356cdcb786c64523f21040b128
2022-12-15 06:32:54 +00:00
Kuan Wang
52ad3ba925
add OWNER for protos directory
...
Test: NA
Bug: NA
Change-Id: I985a4918d7bac938dc843c8cdce1f139b5449609
2022-12-15 06:31:25 +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
29e6a8c0f9
[automerger skipped] Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev am: e8e2d9c68f
am: c743f44644
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 1a49146508
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20704230
Change-Id: I2687004add2e20b85685248644bcddcc88c7e6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 05:53:51 +00:00
Ankita Vyas
6e171e05f7
AppClone: Do not show work tab in Cloned Apps page
...
We do not support app cloning on work profile. Hence even though managed
profile is present on the device, do not show work tab in Cloned Apps
page.
Bug: 248204976
Test: make RunSettingsRoboTests -j
Change-Id: Ib99c34b85b2084b48eb2485787666c95040fa0dc
2022-12-15 05:52:40 +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
TreeHugger Robot
ca390cd6c2
Merge "Fix b/262378515: NullPointerException in TabPreference.onDetached()"
2022-12-15 05:28:42 +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
Chaohui Wang
1445d985bb
Move AppItem into AppListModel
...
Follows the api changes in Spa privileged lib.
Bug: 260660819
Test: Unit test
Test: Manually with Settings
Change-Id: Ieec1035070cc532eedcd1511c5b347e04099a9fb
2022-12-15 12:32:54 +08: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
17cd85b946
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:33 +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
Arc Wang
c8b31a5170
[automerger skipped] Settings 2-pane deep link vulnerabilities am: d1549f2243
-s ours
...
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 c3141fa911
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727214
Change-Id: I28575cf0dba875e1c0f2cd9a17cf09f98f33522e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-15 03:17:30 +00:00
Bonian Chen
b7c309b075
Merge "[Settings] Try to reduce the time pending on BroadcastReceiver"
2022-12-15 01:16:24 +00:00