Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,252 Commits 3 Branches 0 Tags
0ea487294746a67798be88c879ec4e7626dc7c6f
Commit Graph

660252 Commits

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

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

Change-Id: Ib2fe28ff3383cd04d3f0fa571704d8a7ec6aea1c
 2022-01-09 05:25:47 +00:00
Bill Yi
57bc755b1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b01eacb086 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7404c07db7af9110098be2ecc983934b08f67462
 2022-01-09 05:25:39 +00:00
TreeHugger Robot
f517a91788 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-09 05:19:36 +00:00
TreeHugger Robot
fa74a4e90d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:23 +00:00
TreeHugger Robot
7a19c3bb35 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-01-09 05:09:34 +00:00
Bill Yi
e08f09e725 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77bbe002c169eb11ad6ab8d241370e598166238f
 2022-01-08 07:16:52 +00:00
Bill Yi
0e142030ad Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4423fad1d4714d4313648513206ff04d8e9f4ff2
 2022-01-08 03:46:47 +00:00
Bill Yi
be07d3d284 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99d918432eb42e535b2c3558f878fe5ed3fe8919
 2022-01-08 03:22:59 +00:00
Bill Yi
b01eacb086 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If56c3aacb9bc91399e27af1b913c0a0b62ef7475
 2022-01-07 09:37:13 +00:00
Bill Yi
093609dd4d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2152a42cf63ea8dbba25e5b206d6d2daa787c99a
 2022-01-07 09:27:57 +00:00
Siarhei Vishniakou
95534b7936 [automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f am: bc36420027 -s ours am: 450139ff05 -s ours 
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 cccf19150f is already in history

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

Change-Id: I7bed699b43672346efa565d2950637542f96bfbc
 2022-01-03 05:05:37 +00:00
Siarhei Vishniakou
450139ff05 [automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f am: bc36420027 -s ours 
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 cccf19150f is already in history

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

Change-Id: I7353218241eab0f9dbe56148bb98a8fbc8f6aea9
 2022-01-03 04:49:54 +00:00
Siarhei Vishniakou
bc36420027 Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Bug: 212491043
Change-Id: I3d950291123ab9236b40341856d4524f642fa350
Merged-In: I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593
 2021-12-29 08:05:59 +00:00
Siarhei Vishniakou
940a261a8b [automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f am: 71b819723b -s ours am: 6f9fb3dba1 -s ours 
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692ba7 is already in history

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

Change-Id: Idaba2e955fc48ab6aef569da508ee7ffb4933556
 2021-12-29 05:51:42 +00:00
Siarhei Vishniakou
6f9fb3dba1 [automerger skipped] Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f am: 71b819723b -s ours 
am skip reason: Merged-In I9ccdfd298f32c36b9c4da68c2e9c355c97dc7593 with SHA-1 d732692ba7 is already in history

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

Change-Id: I187f7af8b7df0e26ddcb132d9299637df4c8bf4b
 2021-12-29 05:34:09 +00:00
Siarhei Vishniakou
71b819723b Add ALLOW_SLIPPERY_TOUCHES permission am: cccf19150f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16510843

Change-Id: I9153b444c36d8f5456bf911aa4c27979be80bb7b
 2021-12-29 05:02:31 +00:00
Bill Yi
a766688bb3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-24 15:42:42 +00:00
TreeHugger Robot
10936e5353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 788d9efaca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8263ee7c476eabdb1e8ac7842f4bbf3ea1e94a6
 2021-12-23 18:58:23 +00:00
TreeHugger Robot
372a4ffb66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 840efa7fde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I718e9d05e3ac21e974e6c731b4b01fb4e1e4f638
 2021-12-23 18:58:13 +00:00
TreeHugger Robot
08dd666977 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9d92c6b62d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccdca588743cefac043606e1fb09ecfb5422b691
 2021-12-23 18:57:30 +00:00
TreeHugger Robot
8842df1cff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3c530488c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If73854a99d1a0f9c55dd6cd472e27dcfdc44d7d8
 2021-12-23 18:56:40 +00:00
TreeHugger Robot
667a9934e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3e5b3c9c99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If111ea18422af1b4e85513b59d7e95ab7c8d6b3e
 2021-12-23 18:56:29 +00:00
TreeHugger Robot
ecf032fb15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cab1c01837 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iedf0d19b744ac8f3e32085be1156299d0b97861b
 2021-12-23 18:56:08 +00:00
TreeHugger Robot
982f97e34d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d114d60575 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85eb82e2cc0810c07f6fa2a1031e4fb57fde03e5
 2021-12-23 18:55:21 +00:00
TreeHugger Robot
dd9bdeafdf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:30:25 +00:00
TreeHugger Robot
788d9efaca Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:26:16 +00:00
TreeHugger Robot
840efa7fde Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:25:59 +00:00
TreeHugger Robot
9d92c6b62d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:25:52 +00:00
TreeHugger Robot
3c530488c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:25:49 +00:00
TreeHugger Robot
3e5b3c9c99 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:24:19 +00:00
TreeHugger Robot
7ac8091b3a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:20:53 +00:00
TreeHugger Robot
cab1c01837 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:20:17 +00:00
TreeHugger Robot
d114d60575 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:19:47 +00:00
TreeHugger Robot
bbc8213e2e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:17:22 +00:00
TreeHugger Robot
c6c2f6b33c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:16:50 +00:00
TreeHugger Robot
d9266e360a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:16:16 +00:00
TreeHugger Robot
5416913dc3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-12-23 18:13:21 +00:00
Lucas Lin
a81742641d [automerger skipped] Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev am: 34137fbbff -s ours 
am skip reason: Merged-In I0013039f58a6f7c5c73b9acc877d70a0126d0ca7 with SHA-1 e4049855c6 is already in history

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

Change-Id: Ifa73bdaf6530c89bd93729d2096ce0fb2c08ff28
 2021-12-23 12:29:49 +00:00
Lucas Lin
34137fbbff Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-dev 2021-12-23 12:14:44 +00:00
Lucas Lin
9c09f812c2 Merge "Prevent an app to check if the specified VPN app is set VPN always-on" into sc-mainline-prod 2021-12-23 11:20:39 +00:00
TreeHugger Robot
9d27f61b65 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev am: 5179b1de82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16445550

Change-Id: I59032561dbbbc32fafaf5280b623604850f49700
 2021-12-23 06:55:18 +00:00
lucaslin
e4049855c6 Prevent an app to check if the specified VPN app is set VPN always-on 
An app can check if the specified VPN app is set VPN always-on
or not by calling VpnManagerService#prepareVpn(). If it sets
oldPackage to null and newPackage to a specified VPN app which
is set always-on, then prepareVpn() will return true. So the app
could know the specified VPN app is installed and it's set
always-on.

Bug: 191276656
Test: atest FrameworksNetTests CtsNetTestCases \
      CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
Merged-In: I0013039f58a6f7c5c73b9acc877d70a0126d0ca7
 2021-12-23 06:54:36 +00:00
TreeHugger Robot
5179b1de82 Merge "Add ALLOW_SLIPPERY_TOUCHES permission" into sc-dev 2021-12-23 06:40:10 +00:00
Nate Myren
de9f912d6b Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev am: e904d48c7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16380965

Change-Id: Iaed811f0eae15db5c835f06b201597e30a6036af
 2021-12-22 20:21:12 +00:00
Nate Myren
e904d48c7e Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev 2021-12-22 20:04:29 +00:00
Bill Yi
3882ba3ec2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cf56af01587234162633a0e5137f37228fa3d2a
 2021-12-22 16:44:29 +00:00
Bill Yi
b7b768100f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4f3969db88d7f569e46d19f23d34817f79fafb1d
 2021-12-22 16:29:51 +00:00
Bill Yi
04db84453d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d981af7df6557424bbcb041bc6b2d81b3c6d65f
 2021-12-22 16:21:14 +00:00
Bill Yi
c0459d0ae7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaf0d5220074f0aa1af066dc522254ffb67bb2ffe
 2021-12-22 16:16:44 +00:00
TreeHugger Robot
45a790a4c6 Merge "Annotate mainline code runs on only some versions" into sc-mainline-prod 2021-12-22 15:03:55 +00:00