Commits · 572d2ec85c0cef66a7a44c15cc54252bb5fb65ba · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 15, 2021

Rename getVpnLockdownWhitelist to -Allowlist · 572d2ec8
Lorenzo Colitti authored 4 years ago
```
Test: m
Bug: 173331190
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
```
572d2ec8

Merge "Expose VpnTransportInfo as module-lib API." am: am: am: · d9334a47

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71abed2260e6b57a96132c1e978f499809ce98cc

d9334a47

Merge "Expose VpnTransportInfo as module-lib API." am: am: · e510c506

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c86cd1089bd4fe406fadf2e0ab6609558ed8510

e510c506

Merge "Expose VpnTransportInfo as module-lib API." am: · 094211de

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66

094211de

Merge "Expose VpnTransportInfo as module-lib API." · 4a7e41a6
Treehugger Robot authored 4 years ago

4a7e41a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev · 261569ce
TreeHugger Robot authored 4 years ago

261569ce

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: ... · 202658f0

Lorenzo Colitti authored 4 years ago

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: 45ec3191 am: 246444fe am: ed9730e6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698b6b082b121c004b2c8b05ef423da1bd8b871b

202658f0

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: am: · ed9730e6

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91816c01a799a89b89098a6e9ff256dae7d31dbf

ed9730e6

Expose VpnTransportInfo as module-lib API. · d92d403e

Lorenzo Colitti authored 4 years ago

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

d92d403e

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 am: · 246444fe

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I042d739aff199b0c7dff06008dcfaa9492e08d95

246444fe

Merge "[WifiCoex] Add carrier config flags for 5GHz Wifi/LAA coex" into sc-dev · 7f11596f
TreeHugger Robot authored 4 years ago

7f11596f

Merge changes Ia68f482a,I4911e214,Ied379654,I66d18512,Ie8e1bd63 · 45ec3191

Lorenzo Colitti authored 4 years ago

* 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.

45ec3191

Feb 14, 2021

[automerger skipped] Merge "Add DPM.getKeyPairGrants()" am: am:... · 7bc32e7d

Rubin Xu authored 4 years ago

[automerger skipped] Merge "Add DPM.getKeyPairGrants()" am: 944e30cf am: aa0847ed am: 592a8582 -s ours

am skip reason: Change-Id Ieee1048b145fb8400eccbf32c054afc64b5d90c0 with SHA-1 148e31d7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb3d94ca457a35e01d47f47d092565e4f668b33f

7bc32e7d

Import translations. DO NOT MERGE ANYWHERE · 6b4a0db9

Bill Yi authored 4 years ago

Auto-generated-cl: translation import
Change-Id: Iac2dd794c016e981b7021b5ec6ebcc20616977e6

6b4a0db9

Merge "Add DPM.getKeyPairGrants()" am: am: · 592a8582

Rubin Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ad6809ee6231592488e160fcfef571e452b5304

592a8582

Merge "Add DPM.getKeyPairGrants()" am: · aa0847ed

Rubin Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1b40fa34cd02b2e0b69668328687169456602e

aa0847ed

[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am:... · d4d71088

Treehugger Robot authored 4 years ago

[automerger skipped] Merge "Add KeyChain.createManageCredentialsIntent" am: acc78ee8 am: 424cd636 am: 3b43270c -s ours

am skip reason: Change-Id I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2 with SHA-1 eff614db is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f75cd0d0ef389304cde68a80152135cb979f476

d4d71088

Merge "Add DPM.getKeyPairGrants()" · 944e30cf
Rubin Xu authored 4 years ago

944e30cf

Merge "Add KeyChain.createManageCredentialsIntent" am: am: · 3b43270c

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcd213b9e760b09f69753378c91a4afff47f63a9

3b43270c

Merge "Add KeyChain.createManageCredentialsIntent" am: · 424cd636

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56b4c955a512f66a5d0ddf23f2edc140c067b86b

424cd636

Merge "Add KeyChain.createManageCredentialsIntent" · acc78ee8
Treehugger Robot authored 4 years ago

acc78ee8

[automerger skipped] Merge "Add KeyChainService credential management app... · 5b94267c

Rubin Xu authored 4 years ago

[automerger skipped] Merge "Add KeyChainService credential management app APIs" am: e02debeb am: e5ba22ab am: 275601c1 -s ours

am skip reason: Change-Id I00b7df27a92f6ee4f74546f892c83290fead1112 with SHA-1 e17727eb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd1ba99bd80f07fbee1adf46fa25a42f29277841

5b94267c

Merge "Add KeyChainService credential management app APIs" am: am: · 275601c1

Rubin Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40a70a22f5d652e24d3fb31569e639e9313927b1

275601c1

Add KeyChain.createManageCredentialsIntent · 72ff9029

Rubin Xu authored 4 years ago

Missed from previous cherry-pick.

Test: make -j docs
Bug: 179180345
Merged-In: I1e57ed9c18a1ada463c55dbf17ce30e31aa7bad2
Change-Id: I1d88e11740a13490613962c944b528e6c2bd0fcb

72ff9029

Merge "Add KeyChainService credential management app APIs" am: · e5ba22ab

Rubin Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id023e84b28ec938a90fe9a78bc985f12a0031609

e5ba22ab

Merge "Add KeyChainService credential management app APIs" · e02debeb
Rubin Xu authored 4 years ago

e02debeb

Merge "Fix format of helper msg" am: am: am: · 4fb93dab

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2767dfa8804368b46dcae17b6684c97853966c4b

4fb93dab

Merge changes from topics "pans", "pans-permission" am: am: am: · 8eda5a7e

James Mattis authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267

8eda5a7e

[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: am:... · e39c9464

Rubin Xu authored 4 years ago

[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa am: a9f241bb -s ours am: 5ea7cd28 -s ours

am skip reason: Change-Id Ifd87b5e38f341db4b34bf9f61480e29e49148846 with SHA-1 d3c01ef5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44df4bb309bd00dc5f8094aefdb92484fc6cdb5c

e39c9464

Merge "Keep source ID into native object" into sc-dev · 6777f05b
TreeHugger Robot authored 4 years ago

6777f05b
Merge "Fix NPE in getCompatibleMagnificationSpecForWindow" into sc-dev · 55534976
TreeHugger Robot authored 4 years ago

55534976
Merge "Convert WakelockPowerCalculator to work with BatteryUsageStats" into sc-dev · ca9dfbe5
Dmitri Plotnikov authored 4 years ago

ca9dfbe5
Merge "Simplify SystemServicePowerCalculator" into sc-dev · d77bb6a4
Dmitri Plotnikov authored 4 years ago

d77bb6a4
Merge "Fix formatting of the dumpsys activity output" into sc-dev · 99e8b60b
TreeHugger Robot authored 4 years ago

99e8b60b

Merge "Fix format of helper msg" am: am: · 7056d6af

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d6dc40fffffaa92897d1cd5e04ee3a4fd99b932

7056d6af

Merge "Invoke organizer events when a display is added / removed." into sc-dev · 1514f39e
Chris Li authored 4 years ago

1514f39e

Merge "Fix format of helper msg" am: · 190bdb19

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e496df5538ad78cd2daa3b2dff887ee47ce557

190bdb19

Merge "ActivityManager: create process group in behalf of app zygote" into sc-dev · 17893935
Marco Ballesio authored 4 years ago

17893935
Merge "Fix format of helper msg" · 6e87192c
Tianjie Xu authored 4 years ago

6e87192c

Keep source ID into native object · 5dd6dd55

Seigo Nonaka authored 4 years ago

To avoid static field and synchronization for the mapping, keep source
identifier into native font instance.

Bug: 179113771
Test: minikin_tests
Test: hwui_unit_tests
Test: atest CtsTextTestCases CtsGraphicsTestCases
Change-Id: I238e7b8090ee89101937ec22cbe7c68aea97bcfd

5dd6dd55