Edgar Wang
52d65e4d24
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
-s ours am: 2e19b6a0da
-s ours am: 409b9b13ba
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: Ieb02813ea33530914263512ede2710f0e3fc1ce6
2022-01-13 05:57:10 +00:00
Edgar Wang
f252d373bf
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: c363b9f075
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: Ia737e6cb89cafd19d6a8ca937446423dd4f66ba4
2022-01-13 05:57:07 +00:00
Automerger Merge Worker
742e4accdc
Merge "[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
am: cea95e05ca
-s ours"
2022-01-13 05:57:00 +00:00
Edgar Wang
2d002ecdb3
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
am: cea95e05ca
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 359512cd95
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: I086bb58d984d0925b5a24e11fa53414016d90b4b
2022-01-13 05:56:54 +00:00
Edgar Wang
0176f0dccd
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
-s ours am: 463624d522
-s ours am: 0a298b167d
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586
Change-Id: I25fbef4a9b5d8799b36d5a588985d2508e9ecde2
2022-01-13 05:56:50 +00:00
Edgar Wang
dff5e67070
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 362000122e
am: 60af57af90
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 359512cd95
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579590
Change-Id: Ida822f0fcfa4ae4b7ad0eac6ffc221498a570504
2022-01-13 05:56:48 +00:00
Edgar Wang
89fee8de3b
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: 761a605352
-s ours am: 56eb657908
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: Iffc11a0beaf796cec3547a8d7158a543e80a6659
2022-01-13 05:56:33 +00:00
Edgar Wang
3e6893d502
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours am: 1ca7d315db
-s ours am: 169e366ac3
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: I128ffd4275ce39f93e03ccb2f742f465c7e007ff
2022-01-13 05:56:27 +00:00
Edgar Wang
d545a97f9b
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
am: 781a615a41
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: I9d14271bcb2cd1bc971aed2f108f09df98586fd7
2022-01-13 05:56:18 +00:00
Edgar Wang
0a298b167d
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
-s ours am: 463624d522
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586
Change-Id: Ie5a778da092bf3055ec6ccc8641b684d7f54ad46
2022-01-13 05:45:13 +00:00
Edgar Wang
a821946744
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: 761a605352
-s ours am: 8a964679e7
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: Icecec266938a65c20857a488aa14d7cb456672f4
2022-01-13 05:45:03 +00:00
Edgar Wang
c1fb4cc177
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours am: 1ca7d315db
-s ours am: 02a8368286
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: I8a2468cd50c806ce585fd4f790410125b28b50e7
2022-01-13 05:44:58 +00:00
Edgar Wang
409b9b13ba
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
-s ours am: 2e19b6a0da
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: I3ad9f5982c86682587eaa61784181ae41178a188
2022-01-13 05:44:52 +00:00
Edgar Wang
56eb657908
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: 761a605352
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: I43c83b3770e67629d3690730ffd82fece99b7e41
2022-01-13 05:40:55 +00:00
Edgar Wang
169e366ac3
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours am: 1ca7d315db
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: If4f11c3200eaac9bc82dcf70f72268bd00f862d2
2022-01-13 05:40:48 +00:00
Edgar Wang
781a615a41
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: Ice31d95883bab76241015851444c3feb6bfa4b3c
2022-01-13 05:40:41 +00:00
Edgar Wang
8a964679e7
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: 761a605352
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: I059f14dc9e47ad59d811e68250fa1b07ea9c8bac
2022-01-13 05:40:31 +00:00
Edgar Wang
761a605352
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: I968ec3a812591dac1ec67d5b614d7739a1607e64
2022-01-13 05:40:26 +00:00
Edgar Wang
02a8368286
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours am: 1ca7d315db
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: Ida96339b0445175625089d5833e6ff116949284f
2022-01-13 05:40:25 +00:00
Edgar Wang
2e19b6a0da
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 4fb753d22e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: I6ae5cb0b33e7d03ee6c0b259a94bb4541a1f843d
2022-01-13 05:40:19 +00:00
Edgar Wang
1ca7d315db
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: Ibd39dbbcfca577d349e68a971c6fe559323956b3
2022-01-13 05:40:19 +00:00
Edgar Wang
e95b2c6c53
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586
Change-Id: I3311a1514d0edeca1011642e2a368b7aa6eeb170
2022-01-13 05:40:08 +00:00
Edgar Wang
60af57af90
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 362000122e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579590
Change-Id: I468a47507f90ae3434752f762993981eb5076eb6
2022-01-13 05:39:54 +00:00
Edgar Wang
463624d522
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586
Change-Id: I5e42a5a8939af57523b1691c5f525df746e94ac1
2022-01-13 05:39:53 +00:00
Edgar Wang
c363b9f075
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: I8f21f65450c0c3d9cb9f976e94273d5a35444094
2022-01-13 05:39:37 +00:00
Edgar Wang
cea95e05ca
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: Id08f433e70d184be4d38db04c5a4097ca6a803b1
2022-01-13 05:39:31 +00:00
Edgar Wang
edcb9c9b0e
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours
...
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579587
Change-Id: I6bf44b9e56ac21a73b7ea20b756a4d93a438e485
2022-01-13 05:39:03 +00:00
Edgar Wang
2df76f6062
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev
2022-01-13 05:27:40 +00:00
Edgar Wang
36a989cdff
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev
2022-01-13 05:27:31 +00:00
Edgar Wang
362000122e
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev
2022-01-13 05:27:16 +00:00
TreeHugger Robot
f2b73bb69e
Merge "Fix color checking error of the repohooks"
2022-01-13 05:04:21 +00:00
menghanli
9fd21d5853
Fix color checking error of the repohooks
...
Bug: 210353709
Test: repo upload
Change-Id: Ib0926751a29c30da26afeb0eaa7464eccec00280
2022-01-13 11:28:38 +08:00
Lais Andrade
54ed73ae6c
Merge "Update Settings to use intensity settings as main preference keys"
2022-01-13 02:45:41 +00:00
TreeHugger Robot
a1c550650b
Merge "Implement Tooltips widget for QS panel"
2022-01-13 00:11:03 +00:00
Lais Andrade
141b5bb3bc
Update Settings to use intensity settings as main preference keys
...
Updating the Settings app to allow setting the value off for key
HAPTIC_FEEDBACK_INTENSITY. This setting state is also copied onto
HAPTIC_FEEDBACK_ENABLED setting, so both should be in sync after this
change.
Similar logic is applied between RING_VIBRATION_INTENSITY and
VIBRATE_WHEN_RINGING.
This will not disable the hardware feedback since that one is controlled
by a separate setting key now.
The "vibrate for calls" was also removed and the single toggle for
"vibrate first then ring gradually" was moved into the "Vibration &
haptics" page.
Bug: 185351540
Test: [HapticFeedback|NotificationVibration|RingVibration][Intensity|Toggle]PreferenceControllerTest
and manual testing of the AOSP settings app
Change-Id: I9c94cef331a1500a1272a601ba32667ca995ddab
2022-01-12 22:59:29 +00:00
Mady Mellor
f9fc2e0d1e
Use hasSentValidBubble in settings
...
This change makes it such that bubble settings will only be available once
the app has sent a bubble notification.
Test: atest BubbleSummaryPreferenceControllerTest
Bug: 178387292
Change-Id: I459ffcedc4194d953e8b7170937e2eb5334d1422
2022-01-12 14:10:34 -08:00
Ronish Kalia
a4da2c2121
Merge "Update settings string"
2022-01-12 17:44:53 +00:00
Oli Lan
13adae672e
Merge "Add config flag in Settings to control whether restricted profiles are offered."
2022-01-12 17:40:09 +00:00
TreeHugger Robot
70e9695809
Merge "Update new API for checking the embedding status"
2022-01-12 12:55:50 +00:00
menghanli
e9f9985e95
Implement Tooltips widget for QS panel
...
- Show the illustration and QS tile label text
- Dynamic update popup window width by content
- Support the auto close timer API
Bug: 210353709
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsTooltipWindowTest
Change-Id: I8e0d3ff4ef6a48a54ef1e80724002d2cd28d7ac3
2022-01-12 11:07:51 +00:00
Yuri Ufimtsev
7b5f806734
Merge "Exclude Privacy Settings from search if Safety Center is enabled"
2022-01-12 09:42:38 +00:00
Tsung-Mao Fang
13a76eb84e
Update new API for checking the embedding status
...
Test: Make sure behavior is correct as it was in
search flow, higlight flow, regular settings flow, split screen flow.
Bug: 204399167
Change-Id: I7fc29c8cdbfc6682963591f4ff805070bea4ca22
2022-01-12 15:00:07 +08:00
TreeHugger Robot
580cc81f11
Merge "Revert "Revert "Revert "Prevent side channel package installation enumeration""""
2022-01-12 05:22:05 +00:00
Eric Biggers
b4060ef65b
Remove FDE support from accessibility settings
...
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services. Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.
Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary. Remove it.
Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-01-11 18:53:51 -08:00
Eric Biggers
6552bdd0ef
Rename crypt_keeper_* strings that are still used
...
Some strings used in the Settings UI have "crypt_keeper" in their names,
but they aren't specific to FDE, which is no longer supported. They are
still used to report the encrypted status of the device on devices that
use FBE, or the unencrypted status of the device on devices that don't
have encryption enabled at all. Rename these strings appropriately.
Test: On Cuttlefish with and without encryption enabled, tested visiting
the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: Ic63910c870837f5b37e4407ba5b3c7629e925c17
2022-01-11 18:53:51 -08:00
Eric Biggers
36609c18d1
Remove CryptKeeperSettings
...
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.
For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings. Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.
Test: On Cuttlefish with and without encryption enabled, tested visiting
the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-01-11 18:53:51 -08:00
Eric Biggers
43616ed3b6
Remove CryptKeeper
...
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption). FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed. Remove it.
Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place. Later CLs will remove FDE-specific code from the
Settings app.
Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
2022-01-11 18:19:22 -08:00
Betty Chang
277976811d
Merge "Add WiFi Enterprise restrictions check for WiFi Configuration Addition"
2022-01-12 02:04:17 +00:00
Arc Wang
43928754a3
Revert "Revert "Revert "Prevent side channel package installation enumeration"""
...
This reverts commit d3512d2693
.
Reason for revert: <To fix b/214020839 - Broken test: android.os.cts.AutoRevokeTest#testAutoRevoke_userAllowlisting>
Change-Id: I4be6314a107a66cda293252b6b3da33f928d1400
2022-01-12 01:14:49 +00:00
Alex Johnston
3ae979bf27
[automerger skipped] Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: d8124d47f0
-s ours am: ca8073159b
-s ours am: d567862732
-s ours
...
am skip reason: Merged-In I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0 with SHA-1 04c66a0a3c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Id977a554f2d8c37c5ec44838080a306bfea4e340
2022-01-11 22:13:38 +00:00