Commit Graph

86467 Commits

Author SHA1 Message Date
Bill Yi
9400843a91 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours
am skip reason: Merged-In I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4 with SHA-1 3387491083 is already in history

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

Change-Id: I4f51c80cf4e32c384afad849c04c7c6afa065767
2022-01-07 02:01:47 +00:00
Alex Johnston
35e3d0c1b0 Add caller check to com.android.credentials.RESET
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
2022-01-06 22:17:17 +00:00
Bill Yi
ea1249b895 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
Change-Id: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
2022-01-05 21:10:49 -08:00
Alex Johnston
db9333baac Add non system overlay flag to RequestManageCredentials
Bug: 205150380
Test: Manual testing with Settings and TestDPC
Change-Id: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
Merged-In: I7c23442e143a6d74935945e6f5e4ce5ce0ef77f0
2022-01-05 20:19:47 +00:00
Chen Xu
3387491083 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
2022-01-04 20:02:29 +00:00
Chen Xu
44e579e3ea Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I580a094ed849679e0a7a96cd6c6558abe758a1ea
2022-01-04 20:02:25 +00:00
Chen Xu
688f9d61cd Merge "eSIM deprecated API test Refactoring" am: a4f936408c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: Iab671e2e10141401921aa0a27a24a4f222570fa0
2022-01-04 19:18:08 +00:00
Chen Xu
cb851c79ae Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I1f2e66287f1cdad92515b3d248cacd56991fa38b
2022-01-04 19:18:06 +00:00
Chen Xu
a4f936408c Merge "eSIM deprecated API test Refactoring" 2022-01-04 18:50:10 +00:00
Chen Xu
c479598895 Merge "[MEP] eSIM deprecated API Refactoring" 2022-01-04 18:50:10 +00:00
SongFerngWang
4fdf8be369 [MEP] eSIM deprecated API Refactoring
The telephony APIs were changed, the Settings needs the refactoring.

Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)

Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
Merged-In: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2022-01-04 10:13:04 +00:00
sandeepjs
dbe31b8e6b eSIM deprecated API test Refactoring
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
Merged-In: Iedeb90f186ab9f82894e2fecef86d339c8989542
2022-01-03 12:15:02 +00:00
Treehugger Robot
3843e5a957 Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c am: f3f9477f6e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140

Change-Id: I8b672fa0f23eb1278d20ef3e32c9f2f93176c51d
2021-12-29 20:01:41 +00:00
Treehugger Robot
f3f9477f6e Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140

Change-Id: Ib1030bc382e25f5e653aa9123b2a800a4a402ad7
2021-12-29 19:44:26 +00:00
Treehugger Robot
213d7de48c Merge "Add QUERY_AUDIO_STATE permission" 2021-12-29 19:26:47 +00:00
Treehugger Robot
4df15611f8 Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3 am: fb9b219b9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: Ibba50c2ae901afde68ac7828a10dab3ea9daeac0
2021-12-27 06:29:51 +00:00
Treehugger Robot
fb9b219b9a Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: I4315b4b7a46760aad836a1ec07202c0e6b669fe6
2021-12-27 06:18:13 +00:00
Treehugger Robot
0d0eaad0e3 Merge "Clear non bonded device when device picker start" 2021-12-27 05:59:50 +00:00
Chienyuan
c5b8ae80ea Clear non bonded device when device picker start
Bug: 205258325
Test: manual
Change-Id: I3de46ef79bcf1f643e5cd762b95ad8056237e2c6
2021-12-24 17:42:54 +08:00
TreeHugger Robot
cb71dbf3e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073 -s ours am: c50a74bcaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2b11772d87619d00ef69310f3baab1842dd30a4
2021-12-23 18:51:01 +00:00
TreeHugger Robot
77fd150a83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f -s ours am: 179503712b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief4a6f4c5ba0deb79fb26d63e0f7201f4ef459a3
2021-12-23 18:50:55 +00:00
TreeHugger Robot
cefa2d5659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbbe39e560ba4b09eb7551e257597999767dc747
2021-12-23 18:50:16 +00:00
TreeHugger Robot
daf4f6397a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbd1f12ef61201e1c68d29d792e1dd30617fc3a7
2021-12-23 18:49:15 +00:00
TreeHugger Robot
c50a74bcaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I134d52b57e5f67b7a5cb1e42e0b9d64230a3d10f
2021-12-23 18:49:07 +00:00
TreeHugger Robot
179503712b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b57db49100b629d44c91ee3a83f9d0eb504336d
2021-12-23 18:48:48 +00:00
TreeHugger Robot
cbff549073 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:20:34 +00:00
TreeHugger Robot
ea3917df6f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:20:30 +00:00
TreeHugger Robot
131de319c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-23 18:20:15 +00:00
TreeHugger Robot
1f5c8ea55d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-23 18:20:13 +00:00
Bill Yi
778c36e32e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8615103b5a4df25008ca6ee5d3d5991a6ade0d1d
2021-12-22 17:43:28 +00:00
Bill Yi
4948c670f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib5db99d68b52f343bdc999deb666780690faec52
2021-12-22 17:39:39 +00:00
Bill Yi
bd0b96b416 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2b61f14067ea07e12fa8bdd3f88e15e9eb39dca5
2021-12-22 17:30:18 +00:00
Bill Yi
d271043a53 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I818be87c0115b75678e405d76dcd261251422473
2021-12-22 17:28:35 +00:00
Bonian Chen
59e07d18f3 Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9 am: d692413d83
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382

Change-Id: I55f18581b7980da472dbbd20f843fcc03a27ea72
2021-12-22 05:03:45 +00:00
Bonian Chen
d692413d83 Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382

Change-Id: I89ab03dd12306cbcdf1460c9c940253ba0c2b67b
2021-12-22 04:27:08 +00:00
Bonian Chen
7f348f2ba9 Merge "[Settings] Expand the display area of PIN error message" 2021-12-22 04:08:18 +00:00
TreeHugger Robot
43b16debdb [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours am: 634a94b899 -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history

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

Change-Id: Ie79749d487851c5f5a8709b4bc74aa899cf4e620
2021-12-22 03:57:54 +00:00
TreeHugger Robot
634a94b899 [automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c -s ours
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540 is already in history

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

Change-Id: I3cd73f0e78e5c00e1680e3f335e7f9fc3ce98c56
2021-12-22 03:43:31 +00:00
TreeHugger Robot
15afdd803c Merge "Fix USB tether option" into sc-dev 2021-12-22 03:27:13 +00:00
TreeHugger Robot
02e50b1caf [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours am: 1c0b3b0a7d -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Ibace7dcd9903a97629354e3e66673e57edf6be7a
2021-12-22 03:18:22 +00:00
TreeHugger Robot
1c0b3b0a7d [automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d -s ours
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03 is already in history

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

Change-Id: Ic18aa6cfebdca3cc0e333f29f0a8a1e07270dcf0
2021-12-22 03:00:30 +00:00
TreeHugger Robot
da8ab6a51d Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev 2021-12-22 02:43:04 +00:00
Xin Li
45c581df53 [automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

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

Change-Id: I6fc2e4a1c103c7efad592eb468a441795c267e07
2021-12-21 07:20:47 +00:00
Bonian Chen
48c945e9b5 [Settings] Expand the display area of PIN error message
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.

This is a change to expand the display area to max. capacity but remain
tightly wrap the text.

Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
2021-12-21 14:08:58 +08:00
Xin Li
3be43ae165 Merge "Merge SP1A.211205.008" am: 0bf1802bb3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705

Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3 Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Xin Li
971abb190b Merge SP1A.211205.008
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
William Escande
23ebda4c12 Add QUERY_AUDIO_STATE permission
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker

Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
2021-12-20 13:45:47 +01:00
Treehugger Robot
9713bec956 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
2021-12-20 03:31:28 +00:00
Treehugger Robot
9c2293ca92 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
2021-12-20 03:14:04 +00:00