Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,435 Commits 3 Branches 0 Tags
d6c19708affb6f52b00a76533a4397a939b3644c
Commit Graph

565435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubin Xu
d6c19708af Merge "add MANAGE_CREDENTIALS appop" into rvc-qpr-dev-plus-aosp 2021-02-15 09:47:46 +00:00
Lorenzo Colitti
2762e7c607 Merge "Minor fixes to LockdownVpnTracker." am: 74cbf1917b am: 6e668591d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71
 2021-02-15 07:38:20 +00:00
Lorenzo Colitti
6e668591d8 Merge "Minor fixes to LockdownVpnTracker." am: 74cbf1917b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4
 2021-02-15 06:58:45 +00:00
Lorenzo Colitti
74cbf1917b Merge "Minor fixes to LockdownVpnTracker." 2021-02-15 06:25:16 +00:00
Treehugger Robot
e510c506fe Merge "Expose VpnTransportInfo as module-lib API." am: 4a7e41a6e6 am: 094211dec4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c86cd1089bd4fe406fadf2e0ab6609558ed8510
 2021-02-15 05:51:10 +00:00
Treehugger Robot
094211dec4 Merge "Expose VpnTransportInfo as module-lib API." am: 4a7e41a6e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66
 2021-02-15 05:24:28 +00:00
Treehugger Robot
4a7e41a6e6 Merge "Expose VpnTransportInfo as module-lib API." 2021-02-15 04:54:13 +00:00
Lorenzo Colitti
ed9730e6f9 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191a7 am: 246444fef7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf
 2021-02-15 01:03:06 +00:00
Lorenzo Colitti
98d12c7de9 Minor fixes to LockdownVpnTracker. 
1. Remove the legacy network type. This is only used for logging.
   - Replace the logcat logging with the display transport
   - Remove the EventLogTags logging, since it's likely not
     actually used by anyone.

2. Remove code that checks for NetworkInfo objects in state
   FAILED, since LockdownVpnTracker can never have received any
   such NetworkInfo from ConnectivityService since lollipop.

Bug: 173331190
Test: passes existing tests in ConnectivityServiceTest
Change-Id: I66ed71e51ba18b95862f3a0a5df2775eecea501e
 2021-02-15 09:58:20 +09:00
Lorenzo Colitti
d92d403e76 Expose VpnTransportInfo as module-lib API. 
This information originates in non-mainline system server code
and needs to be passed to the connectivity mainline code.

Bug: 173331190
Test: already covered by CTS tests
Change-Id: Ic612b6a51f7ec13e2213c8754312cf716130c876
 2021-02-15 09:34:19 +09:00
Lorenzo Colitti
246444fef7 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I042d739aff199b0c7dff06008dcfaa9492e08d95
 2021-02-15 00:30:46 +00:00
Lorenzo Colitti
45ec3191a7 Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 
* changes:
  Check registering system default callback needs NETWORK_SETTINGS.
  Move VPN code from ConnectivityService to VpnManagerService.
  Add a skeleton VpnManagerService, and start it on boot.
  Convert LockdownVpnTracker to NetworkCallbacks.
  Minor fixes to VpnTransportInfo.
 2021-02-15 00:00:47 +00:00
Rubin Xu
592a85823e Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c am: aa0847edb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ad6809ee6231592488e160fcfef571e452b5304
 2021-02-14 23:29:32 +00:00
Rubin Xu
aa0847edb5 Merge "Add DPM.getKeyPairGrants()" am: 944e30cf6c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1b40fa34cd02b2e0b69668328687169456602e
 2021-02-14 23:02:47 +00:00
Rubin Xu
944e30cf6c Merge "Add DPM.getKeyPairGrants()" 2021-02-14 22:22:47 +00:00
Treehugger Robot
3b43270cb8 Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb am: 424cd636e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcd213b9e760b09f69753378c91a4afff47f63a9
 2021-02-14 22:18:50 +00:00
Treehugger Robot
424cd636e2 Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588312

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56b4c955a512f66a5d0ddf23f2edc140c067b86b
 2021-02-14 21:50:26 +00:00
Treehugger Robot
acc78ee8eb Merge "Add KeyChain.createManageCredentialsIntent" 2021-02-14 21:28:40 +00:00
Rubin Xu
603f3ee721 add MANAGE_CREDENTIALS appop 
This is part of the work to support
a credential management app on
unmanaged devices.

Bug: 179180345
Test: atest android.appsecurity.cts.AppOpsTest

Merged-In: Ifd87b5e38f341db4b34bf9f61480e29e49148846
Change-Id: Ifd87b5e38f341db4b34bf9f61480e29e49148846
 2021-02-14 19:16:09 +00:00
Rubin Xu
275601c126 Merge "Add KeyChainService credential management app APIs" am: e02debebcf am: e5ba22ab36 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40a70a22f5d652e24d3fb31569e639e9313927b1
 2021-02-14 18:38:40 +00:00
Rubin Xu
72ff9029c6 Add KeyChain.createManageCredentialsIntent 
Missed from previous cherry-pick.

Test: make -j docs
Bug: 179180345
Merged-In: I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2
Change-Id: I1d88e11740a13490613962c944b528e6c2bd0fcb
 2021-02-14 18:32:02 +00:00
Rubin Xu
e5ba22ab36 Merge "Add KeyChainService credential management app APIs" am: e02debebcf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id023e84b28ec938a90fe9a78bc985f12a0031609
 2021-02-14 18:10:10 +00:00
Rubin Xu
e02debebcf Merge "Add KeyChainService credential management app APIs" 2021-02-14 17:06:48 +00:00
Tianjie Xu
7056d6af26 Merge "Fix format of helper msg" am: 6e87192cef am: 190bdb1970 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6dc40fffffaa92897d1cd5e04ee3a4fd99b932
 2021-02-14 03:32:19 +00:00
Tianjie Xu
190bdb1970 Merge "Fix format of helper msg" am: 6e87192cef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e496df5538ad78cd2daa3b2dff887ee47ce557
 2021-02-14 03:05:19 +00:00
Tianjie Xu
6e87192cef Merge "Fix format of helper msg" 2021-02-14 02:27:41 +00:00
James Mattis
6c16aeadfb Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: d11f866ee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8afdee99c0b0813d3e3a61df053f9cdef966949c
 2021-02-13 21:51:49 +00:00
James Mattis
d11f866ee6 Merge changes from topics "pans", "pans-permission" am: 601d16a336 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882
 2021-02-13 21:14:48 +00:00
James Mattis
601d16a336 Merge changes from topics "pans", "pans-permission" 
* changes:
  Marking setOemNetworkPreference as @SystemApi
  Adding permission for OEM managed preferences
  Implementation of setOemNetworkPreference
 2021-02-13 20:54:57 +00:00
Rubin Xu
5ea7cd28fb [automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours 
am skip reason: skipped by user rubinxu

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcd777eb7f52719d447333a2fa1710f3338c01af
 2021-02-13 20:28:51 +00:00
Rubin Xu
a9f241bb43 Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41e5c8a1d3a6ba5902515ffc89da200d7e9cd8a0
 2021-02-13 19:26:53 +00:00
Rubin Xu
c9a8b2fa8e Merge "add MANAGE_CREDENTIALS appop" 2021-02-13 18:32:16 +00:00
TreeHugger Robot
3313688ba5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ff04eafad2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b98c22c63b09ecda587cb148b46c715922affdf
 2021-02-13 18:16:45 +00:00
TreeHugger Robot
48ba58238a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d2b9f5cade -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ff151817522bf9fc03e7d036e810e2a4654bc22
 2021-02-13 18:16:33 +00:00
TreeHugger Robot
e522f0563f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a8d6cf63e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecca2cba3b1e2eecb01dcc8cebfd7df9cec7333d
 2021-02-13 18:15:39 +00:00
TreeHugger Robot
bccf5f80ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2c9b82c65e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5f6af485fab3d10a884c1696206dcee85e1515a
 2021-02-13 18:15:04 +00:00
TreeHugger Robot
ff04eafad2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 18:15:00 +00:00
TreeHugger Robot
b9e31ab8ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b7261fe436 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3f559d1db04dd8d384a5b6b4225585bdd674f59
 2021-02-13 18:14:14 +00:00
TreeHugger Robot
af253df862 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b73f3efce0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib82e4512c350fd44e3415da4dccb10accdc23bce
 2021-02-13 18:13:32 +00:00
TreeHugger Robot
d2b9f5cade Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 18:05:44 +00:00
TreeHugger Robot
9a8d6cf63e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:58:54 +00:00
TreeHugger Robot
2c9b82c65e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:38 +00:00
TreeHugger Robot
b7261fe436 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:18 +00:00
TreeHugger Robot
b73f3efce0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-13 17:49:12 +00:00
Bill Yi
a6d7c030de Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5dbcafcca06381b60c05cfdb2ee0b745c88a8b57
 2021-02-13 03:48:46 -08:00
Bill Yi
de10e13450 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id49401c227b5707affd6b07b90f79690e4384ea4
 2021-02-13 03:16:31 -08:00
Bill Yi
c26eaefeda Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a5b6676a580376ae20dc1713886f56d830760bd
 2021-02-13 01:40:28 -08:00
Kalesh Singh
2c80f89444 Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 am: 06a5b4de17 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03ebf873223a08069d9753f7d8ce41423f58ee02
 2021-02-13 09:20:41 +00:00
Kalesh Singh
06a5b4de17 Merge "Eliminate memtrack variability from the lost RAM calculation" am: 599b4e4ac4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a8f78264c5398430740368874c924db36967e04
 2021-02-13 07:35:55 +00:00
Kalesh Singh
599b4e4ac4 Merge "Eliminate memtrack variability from the lost RAM calculation" 2021-02-13 05:11:28 +00:00