PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,486 Commits 1 Branch 0 Tags
73c95c1ac337cf12d0da9be477d50f0ce9473076
Commit Graph

90486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
73c95c1ac3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours am: 6437b8590b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94760890a5fbd36af6a210251279160f4d14d0fb
 2022-01-09 05:48:21 +00:00
Bill Yi
9e22464ec0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours am: 9d02a7114f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25859b60d5a3d6add12471b4be91fcecf1d5cae1
 2022-01-09 05:45:40 +00:00
TreeHugger Robot
6437b8590b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47fad93803ce4dc9461c8f1c763a182641cfa157
 2022-01-09 05:36:09 +00:00
TreeHugger Robot
661c9295b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours am: fbc1a45d59 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b97577a11da6b2381d86dced3e16e31e3e4d78c
 2022-01-09 05:35:52 +00:00
Bill Yi
9d02a7114f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a20b42fe8fd94ddb726ab7e7364f371db547370
 2022-01-09 05:35:49 +00:00
Bill Yi
422501a5a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours am: edc751bbaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e026a5b12c8c4dd389fb6e27263a30d56e9ea01
 2022-01-09 05:35:39 +00:00
TreeHugger Robot
fbc1a45d59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id72341e0cb3eb113002eb574ac48caa738a79c32
 2022-01-09 05:35:24 +00:00
TreeHugger Robot
8f3bd108d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dd4542560 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1db59b3b259e08f46b4584bafe39458b2522e5a0
 2022-01-09 05:34:59 +00:00
Bill Yi
edc751bbaa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0799eb79c1f6c4bae9bdf6ed1c639e9de03350d4
 2022-01-09 05:34:42 +00:00
TreeHugger Robot
ad7ea804d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
 2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
 2022-01-09 05:34:28 +00:00
TreeHugger Robot
0f91d91d56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: da2e65e4ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8eb8acddb66b72c37413d62585b3a735287c4f21
 2022-01-09 05:34:13 +00:00
TreeHugger Robot
fad8ac95a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-09 05:14:18 +00:00
TreeHugger Robot
9dd4542560 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:13:52 +00:00
TreeHugger Robot
da2e65e4ee Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-01-09 05:13:48 +00:00
Bill Yi
9d0825f6bd [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours am: 6930ac9588 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f6e7ad04936045fed004c2b97ecbe1169491924
 2022-01-07 18:34:09 +00:00
Bill Yi
6930ac9588 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
 2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
 2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:12 +00:00
Bill Yi
fbe6fd97b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
 2022-01-07 10:32:46 +00:00
Bill Yi
f69d80aa34 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
 2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
 2022-01-07 10:25:35 +00:00
Bill Yi
64a765a14c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
 2022-01-07 10:17:54 +00:00
Bill Yi
6ad216fce4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
 2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
 2022-01-07 10:14:50 +00:00
Weng Su
0a1ef933ac Check WiFi restrictions for WiFi QR code intent am: fe5690598c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954

Change-Id: Id2ef05626ba9adce5365ab0f928b7bfc3d556246
 2022-01-07 07:47:20 +00:00
Bill Yi
39df254c94 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
 2022-01-06 18:39:02 -08:00
Bill Yi
369598c0a2 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours am: 9400843a91 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic33a2e4aead117ffd3a2b05146bd68744aaa3733
 2022-01-07 02:22:58 +00:00
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
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
Chen Xu
fb2acc0f78 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd am: 3387491083 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I95bbd270044702f0ed61b8f3cb0af03d6924ad4e
 2022-01-05 19:09:03 +00:00
Chen Xu
7639cd07ff Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae am: 44e579e3ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: Iec896dccd3c15be43a512a896bd6df6bb3e6c5b4
 2022-01-05 19:08:59 +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
9660824dff Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c am: f3f9477f6e am: 3843e5a957 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140

Change-Id: I15353dc274167fe9f7364940b72cd2d116caa4bd
 2021-12-29 20:23: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
Weng Su
fe5690598c Check WiFi restrictions for WiFi QR code intent 
- If WiFi configuration is not allowed, the WiFi QR code intent is
ignored.

- Add SafetyNet Logging to b/202017876.

Bug: 202017876
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppEnrolleeActivityTest

Change-Id: I147d2f4f4fabe2e24d5d3eaaad701b81059e8eee
 2021-12-29 09:33:42 +00:00
Treehugger Robot
adfd4a0dea Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3 am: fb9b219b9a am: 4df15611f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: Ie2f98508e42dd6018744d8de169f7ea49a892ca7
 2021-12-27 06:39:59 +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