Commits · 5fb1be5080feb2ab07c9c11d8062f298888c479e · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 15, 2021

Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev am: · 5fb1be50

TreeHugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86d974a2e1274a218e74b2d5ac7576a85915b744

5fb1be50

DO NOT MERGE Disable privacy indicators am: · 75473c5d

Fabian Kozynski authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3f805d3196fb64c76294177b127fa1e730a5111

75473c5d

Merge "Exposed some testAPIs in NetworkPolicyManager" am: am: · eb740fda

Kholoud Mohamed authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23d3633cda96492ffd8f78b1cb2f348a771d8b05

eb740fda

Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am:... · 61dd4acc

Lorenzo Colitti authored 4 years ago

Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: 4346a646 am: 46654fe8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib20cb0ce6e981f71695edee77e428b4926266ea7

61dd4acc

Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev · 1639387a
TreeHugger Robot authored 4 years ago

1639387a

Merge "Exposed some testAPIs in NetworkPolicyManager" am: · 199dd9b3

Kholoud Mohamed authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I823a2663e5ea6fee8d71a3ed60a320fb1a00cd51

199dd9b3

Merge "Exposed some testAPIs in NetworkPolicyManager" · 4338d7f9
Kholoud Mohamed authored 4 years ago

4338d7f9

Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: · 46654fe8

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81793b6c6ff3e4eb4146a115079443f76eecba13

46654fe8

Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." · 4346a646
Lorenzo Colitti authored 4 years ago

4346a646

BroadcastInterceptingContext: use passed-in broadcast Handler. · 8fdfd462

Lorenzo Colitti authored 4 years ago

Currently, BroadcastInterceptingContext always runs broadcast
receivers on the thread that called sendBroadcast. This means:

1. Receivers might run on the wrong thread, making the test less
   realistic.
2. If any receiver checks what thread it's running on, then
   either the check needs to be modified or deleted, or the test
   must call sendBroadcast on the thread that the receiver
   expects to run on. The latter is impossible when there is more
   than one receiver that needs to run on more than one thread.

This CL adds a setUseRegisteredHandlers method that allows tests
to say that they want each receiver to run on the Handler
specified at registration time.

This CL also enables the new mode for ConnectivityServiceTest,
and resolves a TODO to re-enable a disabled thread check.

The new mode cannot be enabled by default because it would break
most of the tests.

All the below tests pass except for the car bluetooth test
testAutoConnectAdapterOff_returnsImmediately which was already failing.

Bug: 173331190
Test: atest CarInputServiceTest BluetoothProfileDeviceManagerTest
Test: atest NetworkPolicyManagerServiceTest
Test: atest ConnectivityServiceTest
Test: atest TetheringTest TetheringNotificationUpdaterTest
Test: atest VersionedBroadcastListenerTest EntitlementManagerTest
Test: atest TetheringConfigurationTest
Test: atest CachedDeviceStateServiceTest
Test: atest EmergencyAffordanceServiceTest
Change-Id: I3303bb14516f07a55d82a16b59c111ab3f8b0389

8fdfd462

Merge "add MANAGE_CREDENTIALS appop" into rvc-qpr-dev-plus-aosp · d6c19708
Rubin Xu authored 4 years ago

d6c19708

Merge "Minor fixes to LockdownVpnTracker." am: am: · 2762e7c6

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cfdfe54af4ff25e6ca8aee8ddccc74882a72f71

2762e7c6

Merge "Minor fixes to LockdownVpnTracker." am: · 6e668591

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib400714e6faa8cf06487c5d6c721fdd444164fa4

6e668591

Merge "Minor fixes to LockdownVpnTracker." · 74cbf191
Lorenzo Colitti authored 4 years ago

74cbf191

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

Minor fixes to LockdownVpnTracker. · 98d12c7d

Lorenzo Colitti authored 4 years ago

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

98d12c7d

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

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

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

add MANAGE_CREDENTIALS appop · 603f3ee7

Rubin Xu authored 4 years ago

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

603f3ee7

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: · 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 "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 "Fix format of helper msg" · 6e87192c
Tianjie Xu authored 4 years ago

6e87192c

Feb 13, 2021

Merge changes from topics "pans", "pans-permission" am: am: · 6c16aead

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: I8afdee99c0b0813d3e3a61df053f9cdef966949c

6c16aead

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

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: I72035b6d5d6504cece1df472ae317e865ceb7882

d11f866e

Merge changes from topics "pans", "pans-permission" · 601d16a3

James Mattis authored 4 years ago

* changes:
  Marking setOemNetworkPreference as @SystemApi
  Adding permission for OEM managed preferences
  Implementation of setOemNetworkPreference

601d16a3

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

Rubin Xu authored 4 years ago

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

5ea7cd28