PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,342 Commits 1 Branch 0 Tags
71814b355c6ab63d6e96d1b5af6b2edd14d4867c
Commit Graph

112342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a05355cc0a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9526dff7032a7247775459386d64669e27068665
 2023-04-21 23:39:13 -07:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Zoey Chen
2fca3dfff0 [Settings] Update code owner 
Bug: NA
Test: build pass
Change-Id: I6885b8655b8b65511beb3d20732335239f7e3a0f
 2023-04-21 03:26:00 +00:00
Diya Bera
49ea4e5d22 Merge "Adding owners" am: b1aabec0db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db Merge "Adding owners" 2023-04-19 16:30:18 +00:00
Xin Li
752715c5ca Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
Change-Id: If148c3db02f9c6a8845c9ddc02eb466329dddd08
 2023-04-18 16:34:29 -07:00
Diya Bera
33fab7e415 Adding owners 
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
 2023-04-18 22:56:31 +00:00
Chiachang Wang
cd33a0fa88 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:54:49 +00:00
Chiachang Wang
4770d017dc Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:25:49 +00:00
Chiachang Wang
4c5334809d Merge "Populate ipsecSecret field in VpnProfile" 2023-04-13 08:53:57 +00:00
chiachangwang
02156d600d Populate ipsecSecret field in VpnProfile 
This commit fixes IKEv2 RSA VPN could not be an always-on VPN
issue to populate ipsecSecret field from "IPsec user certificate".

Fields ipsecUserCert and ipsecSecret are required for a valid
VpnProfile. The ipsecSecret field in VpnProfile should be
populated from "IPsec user certificate" field. It's the matching
private key.

Bug: 263610164
Bug: 230727391
Test: Verify if IKEv2 RSA VPN can setup successfully and set as
      as always on VPN
Change-Id: I605b35fff9e399ee7b82d8441137984992ab2907
 2023-04-13 07:47:53 +00:00
Treehugger Robot
2f0557495d [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:23:01 +00:00
Treehugger Robot
5d93cea1c7 Merge "Merge TQ2A.230405.003" am: fd8670a4c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258

Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:00:58 +00:00
Treehugger Robot
fd8670a4c1 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:25 +00:00
Treehugger Robot
525b567db3 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 10:18:17 +00:00
Treehugger Robot
ff6def3c7c Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: If249a6b219c344edbddade320f06c9f512bffd18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 09:48:24 +00:00
Treehugger Robot
1452f7dd3a Merge "Align Settings and SystemUI packageName references" 2023-04-12 08:53:22 +00:00
David Liu
a6cd016e9a Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Ife0d2b27db2c12e2129bc0d39fc521e41d59df59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:44:30 +00:00
David Liu
ae70edc7f5 Merge "Update Settings owners list" am: 1a811a130a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: I921670dd1f5c3b39615d42027de10ff3ee8eb3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:15:38 +00:00
David Liu
1a811a130a Merge "Update Settings owners list" 2023-04-12 03:50:16 +00:00
David Liu
0b9bfd3c1f Update Settings owners list 
Change-Id: Idb59b4ebf8d252d31877a6ed2203e7f66fc6e6ff
 2023-04-12 01:48:48 +00:00
Shen Lin
57b03b309d Align Settings and SystemUI packageName references 
This CL migrated both Settings and SystemUI packageName into Utils.java
to align references.

Bug: 277651621
Test: m Settings -j128
Change-Id: I3d6808de76120a2ddbbed4980b8a65cec81502c9
 2023-04-11 10:27:04 +00:00
Xin Li
e11304fe3d Merge TQ2A.230405.003 
Bug: 271343657
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: Ib47a648d9e431f09196d292083abd570d33dcd50
 2023-04-10 23:57:24 -07:00
Chris Antol
626dff2398 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I67b9db14578c047f5a73e8c5fd975e0e8e955eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:21:15 +00:00
Chris Antol
4e2050a17d Merge "Update Settings owners list" am: 8bf186bcf8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: Ia2be910bc9aa3bf6d693f6012eeae94a51e27d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 00:50:30 +00:00
Chris Antol
8bf186bcf8 Merge "Update Settings owners list" 2023-04-11 00:03:40 +00:00
Chris Antol
b5237e60d8 Update Settings owners list 
Change-Id: If950f63c65ecc6313f7096c94c3a5a9bb48be529
 2023-04-10 22:57:24 +00:00
Android Build Coastguard Worker
8e58411b3d Snap for 9905614 from a568dc677b to tm-qpr3-release 
Change-Id: I6c09be861ef0642b9d0c28cc1036967d0e3374ad
 2023-04-08 01:25:50 +00:00
Bill Yi
efc9c4ab6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2039a343cfc2c7ba6ee6409e2649bf0d7aed6f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 15:21:01 +00:00
Bill Yi
a568dc677b Import translations. DO NOT MERGE ANYWHERE 
BUG:271250248

Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
 2023-04-06 20:54:16 -07:00
Android Build Coastguard Worker
542a899d98 Snap for 9898483 from f133736e6c to tm-qpr3-release 
Change-Id: I990127147ae6b466e1b70ddad702838d446ce6ca
 2023-04-06 23:25:31 +00:00
Jason Chiu
e5fa405609 [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours am: f133736e6c -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: I4bafcdad13776f705b0a80380a06249bd88a424c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:27:25 +00:00
Jason Chiu
f133736e6c [automerger skipped] [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 am: 5d50556ce2 -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 4f7205b2ea is already in history

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

Change-Id: If85b58dac4614b53683b7718ea5e6ed3db2fdd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:00:33 +00:00
Bill Yi
c364a011ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: aca33b33aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ec869f9ecf61f60d077179fdee7b2af99e140a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:39 +00:00
Bill Yi
10c1798572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5ef604de7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b53f6aa0858a2a054c342e6eb2e89db7279c544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:30 +00:00
Bill Yi
410e8ac5af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icee3c3aa8fb3126890e0de521bb202c1173c1455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:59:28 +00:00
Bill Yi
21c40c2ef4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37114bb2b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec465b7a3f13deb9c75eaa04999801210e027335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:57:29 +00:00
Bill Yi
aca33b33aa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
Bill Yi
3cc4247a1a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-06 13:50:19 +00:00
TreeHugger Robot
33affdae8e Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282

Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 13:35:23 +00:00
TreeHugger Robot
cb00b2bd0c Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev 2023-04-06 13:07:13 +00:00
Jason Chiu
5d50556ce2 [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906

Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 10:21:27 +00:00
Jason Chiu
0f13f70655 Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 04:23:01 +00:00
Jason Chiu
2e82189b1a Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366

Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 02:51:54 +00:00
Jason Chiu
d0b0aeb2ba Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev 2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 02:22:45 +00:00
Android Build Coastguard Worker
f66bdf20df Snap for 9892340 from fa4e2c72af to tm-qpr3-release 
Change-Id: I78986be3390bc5ed94bd2b94308e6b523e3f08fd
 2023-04-06 01:25:11 +00:00
Bill Yi
a5ef604de7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibda77f75cc4865437dd8dc5f52260b62b9d6f00b
 2023-04-05 18:05:09 -07:00
Bill Yi
37114bb2b0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4b1f4ec2b736b8123de1ee218b367083163d737e
 2023-04-05 18:03:09 -07:00
Prabal Singh
a53a89d370 Add "for work" in work profile biometrics string 
JUSTIFICATION: Around 8 users reporting this issue in b/271250248
RISK: This change is a cherrypick from a fix already made in Android U where no issue has been reported after a few months.
Bug: 271250248
Test: manually tested
Change-Id: Ib16b2d045f4695883276749fcce6ccce60688c09
(cherry picked from commit a9231555e4)
 2023-04-05 17:16:22 +00:00