Commits · ff962af44a9f18b75ad7ba5cd4b2b9c829b74e1b · Farzin Kazemzadeh / platform_frameworks_base-old

Feb 16, 2021

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · ff962af4

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 08771516 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d036597e2eae1be2c96f99e3dd115a3f5749135

ff962af4

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev · 08771516
TreeHugger Robot authored 4 years ago

08771516

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: am: · 952d747c

Frank Li authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6d8d56a79bd7f8751c3604a292f2bb8c34fd765

952d747c

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" am: · 23d31b02

Frank Li authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92df8ef58e30ddefb84001a0b45363e82fdd3621

23d31b02

Merge "[CS01]Remove hidden API usage of NetworkCapabilities" · 5f249209
Frank Li authored 4 years ago

5f249209

Merge "Support parsing legacy reboot escrow data" am: am: · 9bcc5fa9

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0acc30c79574ff6a00cb4cc5334b82d0e9b01e5

9bcc5fa9

Merge "Support parsing legacy reboot escrow data" am: · dd36d037

Tianjie Xu authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85de3f465b440b14ce0535bbd22ed6b76001c553

dd36d037

Merge "Support parsing legacy reboot escrow data" · 8d380420
Tianjie Xu authored 4 years ago

8d380420

Feb 15, 2021

Support parsing legacy reboot escrow data · 44f3adc9

Tianjie authored 4 years ago

Devices updating from R will still use the old version reboot escrow
data. We need to have the backward compatibility to avoid the one-time
failure.

Bug: 178646806
Test: atest FrameworksServicesTests:RebootEscrowDataTest;
Apply an OTA from SP1A.210114.001 to local build with fix, RoR succeeds.

Change-Id: I320966340faa80b97f79e732fb728260dfa1cee8

44f3adc9

Merge "Stop passing in statsFile fds as they will be leaked when returned to... · e0f72d91

TreeHugger Robot authored 4 years ago

Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into rvc-qpr-dev am: 19c43a01

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8622ca830f6ab6f3d8b9d343802a11fc35fccee

e0f72d91

Merge "Add owners for contexthub framework code" am: am: · 42a11252

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib51770039f161702612c5116752dc776bdae034c

42a11252

Merge "Stop passing in statsFile fds as they will be leaked when returned to... · 19c43a01
TreeHugger Robot authored 4 years ago
```
Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into rvc-qpr-dev
```
19c43a01

Merge "Add owners for contexthub framework code" am: · c9ba08c6

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If45233dbe39b25f2f54bbdfee7dc8c7c8e123a3f

c9ba08c6

Merge "Add owners for contexthub framework code" · b6ce95e8
Treehugger Robot authored 4 years ago

b6ce95e8

[CS01]Remove hidden API usage of NetworkCapabilities · 143cae6d

lifr authored 4 years ago

The connection service will become the mainline module. The mutable
NetworkCapabilities is deprecated, and the NetworkCapabilities should
be built through their Builder instead.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest IpConnectivityMetricsTest
Change-Id: I73a4d3a7c118b9cef037ed52efb96ed123da2fa5

143cae6d

Import translations. DO NOT MERGE ANYWHERE · 6021f3f5

Bill Yi authored 4 years ago

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

6021f3f5

Merge "Move the VPN code out of packages/Connectivity." am: am: · f684b8d4

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6c73f67cc7e81025d8c55a437ada9ba4fce34ca

f684b8d4

Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: am: · b79cddd6

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05

b79cddd6

Merge "Move the VPN code out of packages/Connectivity." am: · 6011d524

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44cf61bec31d83217ca836aa387030818cd226cb

6011d524

Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: · 8cec61d8

Lorenzo Colitti authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d

8cec61d8

Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu...""... · fe0e96c0

Remi NGUYEN VAN authored 4 years ago

Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: 9efa7780 am: 0b263af1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12c2fe14714d283e550234a1f05e386ccf6c8fbf

fe0e96c0

Merge "Move the VPN code out of packages/Connectivity." · 8269d21d
Lorenzo Colitti authored 4 years ago

8269d21d

Move the VPN code out of packages/Connectivity. · 4e82e557

Lorenzo Colitti authored 4 years ago

Bug: 173331190
Test: atest FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: Idc6ed1a544e744f8661d1e387da278736d407489

4e82e557

Merge "Rename getVpnLockdownWhitelist to -Allowlist" · e322ecac
Lorenzo Colitti authored 4 years ago

e322ecac

Rename getVpnLockdownWhitelist to -Allowlist · 30f4fb0b

Lorenzo Colitti authored 4 years ago

Test: m
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
Merged-In: Id02a37624655c4ff88744c9c57af9f2a17953667

30f4fb0b

Merge "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" am: · 0b263af1

Remi NGUYEN VAN authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6e86d3195bff6fca762ecf057437f481fcbc884

0b263af1

Merge "Centralise logic for setting credential manager app" am: am: · a90997e6

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I866ec597d625668be13d8833c86b6105f66ee742

a90997e6

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 "Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."" · 9efa7780
Remi NGUYEN VAN authored 4 years ago

9efa7780

Merge "Centralise logic for setting credential manager app" am: · 6cf93cd8

Treehugger Robot authored 4 years ago

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0b3bf391c8c6db22dd932b785b8de21dbb92d52

6cf93cd8

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 "Centralise logic for setting credential manager app" · 353a2c4f
Treehugger Robot authored 4 years ago

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