Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,722 Commits 3 Branches 0 Tags
d4cb37a7d3eca5c380a97d64b835f40fbf0bf18f
Commit Graph

659722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d4cb37a7d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:24:42 +00:00
TreeHugger Robot
7f501131db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:24:14 +00:00
TreeHugger Robot
70defae493 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:21:20 +00:00
TreeHugger Robot
b0298726a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:21:08 +00:00
TreeHugger Robot
fad32ac523 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:20:59 +00:00
TreeHugger Robot
4574ba6620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:19:31 +00:00
TreeHugger Robot
fa189b9d22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:18:51 +00:00
TreeHugger Robot
8fea7291bd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:18:41 +00:00
TreeHugger Robot
6c6c780658 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:16:32 +00:00
Automerger Merge Worker
a18c3121d7 Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev 2022-04-07 16:33:17 +00:00
TreeHugger Robot
196fc30c20 Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev 2022-04-07 16:33:08 +00:00
Remi NGUYEN VAN
0684759f10 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ifb8d0d20243e35601011eedb9442594f24067fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:33:03 +00:00
Remi NGUYEN VAN
c14e995495 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ie1230d9ce9e590b6174ce9d28cc0106d0058b64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:11:58 +00:00
Remi NGUYEN VAN
2f74509789 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:56:13 +00:00
Remi NGUYEN VAN
49f031ea4d Disallow PAP authentication when MPPE is requested am: 4f319df8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:39:14 +00:00
Shawn Lin
88af43ac60 Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev 2022-04-07 13:33:49 +00:00
Tyler Gunn
d4e7e2336a Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: Icd89bfbe997fd18e8b8bfcddd5c198ad34d8d8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:48:40 +00:00
Tyler Gunn
4636aea564 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: Ie04277d055fb481438470087819c529a7392903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:26:29 +00:00
Remi NGUYEN VAN
4f319df8ff Disallow PAP authentication when MPPE is requested 
MPPE cannot work if PAP is used as authentication, so it is not useful
to allow PAP authentication when MPPE is enforced: establishing the
tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not
performed".
Also users enforcing MPPE may assume that this means PAP will not be
used for authentication, so without this change MPPE enforcement gives a
false sense of security, as PAP uses plain-text credentials.

Bug: 201660636
Test: atest VpnTest
Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417
Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417
(cherry picked from commit 997a4a3926)
 2022-04-07 01:18:19 +00:00
Tyler Gunn
e518ef6409 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:01:12 +00:00
Tyler Gunn
6b36ce6895 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:38:45 +00:00
TreeHugger Robot
2ab56508dc [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I21dbbd1657b46707bfc166aaf0e15cbbcccc9df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:29 +00:00
Jonathan Scott
18a459822e [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: Id00e21bafa61a9174b85c68a461400a892d8c77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:16:26 +00:00
Tyler Gunn
74f9b7f432 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:15:07 +00:00
Tyler Gunn
8193edd104 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080

Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:18:55 +00:00
TreeHugger Robot
58e958133f [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I554fe339239a0581021bda208444f846d844a381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:53 +00:00
Jonathan Scott
8b4fe475a8 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I1fa066a66afc97a76304fef898b44a63dd5fb9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 23:10:49 +00:00
Bill Yi
4fe7a5a9dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie2f5ad43e3ac8487d54cd255b657da5627de44a8
 2022-04-06 23:08:16 +00:00
Tyler Gunn
08f8988bc3 Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev 2022-04-06 22:58:29 +00:00
TreeHugger Robot
cc47da056a [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: I99c991458aba3e9f1df9f2ccc111006568058acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:44 +00:00
Jonathan Scott
1c12b23d27 [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: I6925adb48b9b73a59d156396a9c82fedbe307c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:40 +00:00
TreeHugger Robot
607cc6acf4 [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: Ibb2467d2beb1a7a46c6354382fc6108bb5457c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:48:08 +00:00
Jonathan Scott
4d47369e41 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I8a2b23cc9d7258d47e468f780928a32a4503bde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 22:47:37 +00:00
Bill Yi
5a60e95f95 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68d2d553704f480eed2ef635c50ab0478d8e057f
 2022-04-06 22:45:10 +00:00
Bill Yi
30445e708b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6294b47efadd8814a049005cc733db60246c20c7
 2022-04-06 22:28:03 +00:00
TreeHugger Robot
d716a26d58 [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: I05dfde41e89e58a37c6c30453d339919d2ca4df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:18:45 +00:00
Jonathan Scott
3174a8bc5a [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: Ifd5dd14df998cbd36d5a3c5d5d81aedf2e0543f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:18:34 +00:00
TreeHugger Robot
7268d3d045 [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I0472617b5f7ee1dec086aee641339497b8630659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:17:36 +00:00
Jonathan Scott
693fe862b9 [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I4c0aef4b20d7b473d5fa160b64f5e05131b2cd17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:17:19 +00:00
TreeHugger Robot
7744c71e64 [automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: I8217e2a43bae1be58ec76821f16b05f7fbf0bf43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 21:00:09 +00:00
Jonathan Scott
b7248d037f [automerger skipped] [rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: I79744a8cbee16ade46d2f7eb0849b3c6fd41de6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:59:49 +00:00
TreeHugger Robot
63783b32bc [automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I0501b2bfddaf5e666c6962b898d8698abbfa01de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:59:42 +00:00
Jonathan Scott
1aa3133d1b [automerger skipped] [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: Ie1052d196899df0aa598d0fe95b318a6cf737493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:59:26 +00:00
TreeHugger Robot
36f23cd8ac [automerger skipped] Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f am: 8531b25d63 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: Iaf2207c0ec70e7869797e981197a3b6997faa5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:46:31 +00:00
TreeHugger Robot
22be71ece0 Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I86bbad2a5114284d45e566bda350d004b79dbf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:45:53 +00:00
Jonathan Scott
e59b3947e9 [automerger skipped] [automerge] [sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. 2p: b519b549fd am: 685d6d3841 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I65e67129e9a02039800aa4d3cb6bce1ebd5a9e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:45:43 +00:00
TreeHugger Robot
8531b25d63 Merge "[sc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into sc-dev am: 6485eee24f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806

Change-Id: I8e21c49a0b1d9a9f1d29d46c8f5a6731b1f6731c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:37:26 +00:00
TreeHugger Robot
6b4842a815 Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: Ia5272c6945c563040b72921b0e035c81745a0a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:35:01 +00:00
Jonathan Scott
9a83111755 [qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning. am: c5037ec63c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088

Change-Id: I61409fd5cbe7409884dfe0e439d116b098cf9737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:34:58 +00:00
TreeHugger Robot
23c3740386 Merge "[rvc] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530

Change-Id: Ie2d19b07521533699ab4bf814f390e3e03384ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 20:34:57 +00:00