Commit Graph

566107 Commits

Author SHA1 Message Date
Janis Danisevskis
a6dcf091f5 Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
2021-04-01 17:06:41 -07:00
Benedict Wong
f11ccc456b Merge changes I2e52ff67,I9f2b2d0d
* changes:
  Remove subIds from Telephony NetworkRequests.
  Switch to using status codes for Vcn
2021-04-01 23:39:42 +00:00
Treehugger Robot
20f4b99166 Merge "Add OWNERS for some native files" 2021-04-01 22:19:04 +00:00
Benedict Wong
8124f47d3f Remove subIds from Telephony NetworkRequests.
Since NetworkProviders do not at present support requests with subIds
(they always provide an empty list, therefore never have an overlap),
the TelephonyBringupRequests must never present subIds as part of the
requested capabilities.

Bug: 183174340
Test: atest FrameworksVcnTests
Change-Id: I2e52ff67748c0ca226a648682b37dfe0996cb850
2021-04-01 15:11:18 -07:00
Benedict Wong
bd1085ef03 Switch to using status codes for Vcn
This change adds status codes, and switches the Vcn class to use these
to signal safe mode status. Additionally, this allows a distinction
between a VCN that is quitting and one that is simply in safe mode,
providing potential for an opportunistic safe mode where the VCN will
continue to attempt to serve NetworkRequests while not restricting
underlying networks.

Bug: 183174340
Bug: 181789060
Test: atest FrameworksVcnTests
Change-Id: I9f2b2d0d8d7b3ade19ca5adcd48cc920171bf8c3
2021-04-01 15:11:17 -07:00
Paul Duffin
dedc39bc2c Merge "Added platform-bootclasspath" 2021-04-01 19:06:54 +00:00
Steven Moreland
bd32be9d25 Merge "Partial: ActivityManager: use proc state from compiled aidl" 2021-04-01 18:33:54 +00:00
Steven Moreland
42c6e93fde Partial: ActivityManager: use proc state from compiled aidl
In order to fix divergence in libbinder Android.bp file, adding an
empty file group corresponding to an internal file group.

This is needed to easily manipulate where source files are included
in libbinder without having to land patches internally and externally.

Bug: 183654927
Test: N/A

Merged-In: I3dafe7a75b2dae561583a7821284027a1896b9a5
Change-Id: I8821242efdc0a27daddf30368f948855062f2d14
2021-04-01 18:30:28 +00:00
Cody Kesting
03f00e5a52 Merge changes from topic "gateway-connection-id"
* changes:
  Expose API for identifying GatewayConnections.
  Update identification for onGatewayConnectionError().
2021-04-01 18:27:28 +00:00
Paul Duffin
cde72c6791 Merge "Fix presubmit for hidden api." 2021-04-01 18:16:41 +00:00
Steven Moreland
2a27671122 Merge "IBatteryStats.aidl update path" 2021-04-01 18:08:11 +00:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Treehugger Robot
2990dccc16 Merge "Update OWNERS for OnReceiveContentListener and ContentInfo" 2021-04-01 13:38:54 +00:00
Yury Khmel
72dad8a9d1 Fix presubmit for hidden api.
grep returns 1 for if nothing was found. This fails presubmit hook due
to bash handling "set -e" Looks like grep not found is valid case.
This fixes this issue by bypassing grep exit code.

Test: Locally
Bug: 161351699
Merged-In: I39e926a348a0fb8f4040f86034affdb4204faac5
Change-Id: I39e926a348a0fb8f4040f86034affdb4204faac5
(cherry picked from commit e6a5253f12)
2021-04-01 13:17:00 +01:00
Aaron Huang
ef74312993 Merge "Expose BIP and VSIM relavent definitions" 2021-04-01 11:38:17 +00:00
Aaron Huang
c6725ad2bb Merge "Move deduceRestrictedCapability to libs/net and rename it" 2021-04-01 11:37:51 +00:00
Treehugger Robot
7226ad3729 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-01 11:27:29 +00:00
Paul Duffin
3e4ec3b53a Added platform-bootclasspath
Change-Id: I20329dfd1c5beeaf91fb6f9435f79fb1e2ccbb2d
2021-04-01 11:55:31 +01:00
Sergey Volnov
8c6820048d Merge "Add a comment to speech recognition service requiring clients targeting Android 11 to specify a <queries> tag." 2021-04-01 09:26:27 +00:00
Chalard Jean
7151f51c5a Merge "Fix testLegacyLockdownVpn flaky" 2021-04-01 08:19:53 +00:00
Jack Yu
39e56169aa Merge "Display no data notification in certain scenarios" 2021-04-01 08:11:25 +00:00
Chalard Jean
ea4d25a750 Fix testLegacyLockdownVpn flaky
When WiFi disconnects, the VPN disconnects immediately. The
broadcast can therefore be sent before the broadcast receiver is
registered, which causes the receiver to not see the broadcast.

The puzzling part is that CONNECTIVITY_ACTION is a sticky
broadcast, so one would expect the broadcast to still be
received, even if the registration is done after the broadcast
is sent. The reason this doesn't happen is that the context used
by the test is a BroadcastInterceptingContext, which does not
treat sticky broadcasts as sticky.

Bug: 184115648
Test: atest --iterations 1000 'ConnectivityServiceTest#testLegacyLockdownVpn'
Change-Id: Ib44c92839d25951cc7d2db0f923e1b104690e1e0
2021-04-01 06:27:46 +00:00
Treehugger Robot
5aac2c84ba Merge "MTP: Add thumbnail generation for JPG" 2021-04-01 06:20:56 +00:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Chiachang Wang
4f62a89c9e Merge "Add required permission to FrameworksNetIntegrationTests" 2021-04-01 03:15:07 +00:00
Bob Badour
de423b7a58 [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  drm/java/Android.bp
  graphics/java/Android.bp
  identity/Android.bp
  identity/java/Android.bp
  keystore/java/Android.bp
  location/java/Android.bp
  location/tests/Android.bp
  lowpan/java/Android.bp
  media/mca/effect/java/Android.bp
  media/mca/filterfw/java/Android.bp
  media/mca/filterpacks/java/Android.bp
  mime/java/Android.bp
  mms/java/Android.bp
  opengl/java/Android.bp
  rs/java/Android.bp
  sax/java/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  telecomm/java/Android.bp
  telephony/common/Android.bp
  tests/FlickerTests/test-apps/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  telephony/java/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I2ee0af9ce8f74de2172b359b41d2c52a8b8f7e6c
2021-03-31 19:55:25 -07:00
James Mattis
6269d2eb7a Merge "Calling linkToDeath on binder in NRI constructor" 2021-04-01 02:38:58 +00:00
Suprabh Shukla
2589a31c90 Add required permission to FrameworksNetIntegrationTests
Test: atest FrameworksNetIntegrationTests

Fixes: 184166194
Change-Id: I7ad920ba5962f9c71c3c3db86809e7cb6b934425
2021-03-31 18:52:04 -07:00
Steven Moreland
de4e95ed68 IBatteryStats.aidl update path
header moved

Bug: 183654927
Test: N/A
Change-Id: I5a74323f14da8aec636b4dea6eb22eae528556be
2021-03-31 23:46:34 +00:00
Jack Yu
7b8ac258b5 Display no data notification in certain scenarios
For some carriers, display no data notification when
setup data permanently failed (i.e. retry will not hapen)

Bug: 169648447
Test: Manual
Merged-In: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
Change-Id: Ica20169db3c9230172d2cae80a9e6ba3486bfa42
(cherry picked from commit 5badb094f5)
2021-03-31 16:36:35 -07:00
Treehugger Robot
222b1e4ad7 Merge "When a dex file is loaded with different contexts, dexopt with "verify"." 2021-03-31 22:44:25 +00:00
Hall Liu
2e0c2171fd Merge "Add PROPERTY_DOWNGRADED_CONFERENCE to logging" 2021-03-31 22:38:53 +00:00
Jack Yu
ffb09e11c1 Merge "Moved getId API from system to public" 2021-03-31 21:56:53 +00:00
Treehugger Robot
8b0cfd1550 Merge "Revert "Rename the font file with PostScript name based file name"" 2021-03-31 21:49:21 +00:00
James Mattis
0885500488 Calling linkToDeath on binder in NRI constructor
Any NRI constructor that can possibly have a binder should call
linkToDeath on that binder if present. Not doing so can result in a
no such element exception when that NRI is removed.

Bug: 184155022
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I90d594e43474483c554d0d315ff7abb6f678e093
2021-03-31 14:45:27 -07:00
Cody Kesting
5926d20e03 Expose API for identifying GatewayConnections.
This CL exposes the updated APIs for identifying GatewayConnections via
a user-configured String set in VcnGatewayConnectionConfig.Builder, as
requested by the API Council.

Bug: 182345902
Bug: 180522464
Test: atest FrameworksVcnTests
Change-Id: I10afd074906bc0f3831157dcee1da813b4cfce78
2021-03-31 14:23:29 -07:00
Cody Kesting
52265aab76 Update identification for onGatewayConnectionError().
This CL updates the identification method for
VcnStatusCallback#onGatewayConnectionErrror. Previously,
GatewayConnections were identified by an int[] specifying the
GatewayConnection's exposed NetworkCapabilities. Following API Council
feedback, this is updated to identify GatewayConnections by a
caller-provided String set in the VcnGatewayConnectionConfig.Builder.

Bug: 182345902
Bug: 180522464
Test: atest FrameworksVcnTests
Change-Id: I933c2330edb9bfc1b6bb62276debac02460e24f8
2021-03-31 14:22:54 -07:00
Nicolas Geoffray
d51fd91fbc When a dex file is loaded with different contexts, dexopt with "verify".
vdex files can now be used independently of class loader contexts.

Test: m
Bug: 176960283
Change-Id: I9abaa769363d169de683b8aa2521098026a6f2ad
2021-03-31 22:12:08 +01:00
Alan Viverette
2e1c97a4e8 Merge "FIx issue: https://issuetracker.google.com/issues/183024999" 2021-03-31 21:09:53 +00:00
Suprabh Shukla
502baa4117 Merge "Adding some permissions to Shell to enable testing" 2021-03-31 21:08:54 +00:00
Benedict Wong
ab765e0ebe Merge changes I2d30b75c,I57ecf4f5
* changes:
  Switch to using list of subIds for policy generation
  Switch to using list-of-subIds for VCN selection of underlying networks
2021-03-31 20:59:00 +00:00
Seigo Nonaka
e95ec27dd6 Revert "Rename the font file with PostScript name based file name"
Revert "Update ImageGenerator to match the latest font names."

Revert "Rename font file with PostScript based names"

Revert submission 1606485-rename_fonts

Reason for revert: font file name requirement was removed.

Reverted Changes:
Iab8b9d65a:Update ImageGenerator to match the latest font nam...
Ifbe99d68c:Rename the font file with PostScript name based fi...
I307c21531:Rename font file with PostScript based names

Change-Id: I95a52403590127f1762c7551edff9805096daf79
Merged-In: I6bd807ce0df6cd81e44bf89918ac4b7b01c27ae1
2021-03-31 20:38:40 +00:00
Sergey Volnov
f16e2b1d07 Add a comment to speech recognition service requiring clients targeting
Android 11 to specify a <queries> tag.

Bug: 173748514
Test: N/A
Change-Id: If70dde1bff5d79e258e3759a1f9027d51de6b441
2021-03-31 21:20:21 +01:00
Nikita Dubrovsky
79ce1a0010 Update OWNERS for OnReceiveContentListener and ContentInfo
Bug: 152068298
Change-Id: I0d70b3493523f61561b4946274af3bed40bacfb3
Test: Presubmit
2021-03-31 18:50:52 +00:00
Roman Kiryanov
7265a87552 Merge "Migrate HostClipboardMonitor to virtio-vsock" 2021-03-31 18:43:28 +00:00
Treehugger Robot
bdcda2cb05 Merge "Add measurement for dex size." 2021-03-31 18:36:35 +00:00
John Reck
cabdc4cd72 Merge "Add more OWNERs for graphics team" 2021-03-31 18:03:16 +00:00
Treehugger Robot
320c3cff41 Merge "Set up owners for SpeechRecognition packages in frameworks/base." 2021-03-31 16:48:28 +00:00
Anton Hansson
4199ef90b9 Merge changes I97086e30,Ic55df4cf,I81a08c29
* changes:
  Move framework java filegroups into subdirectories
  Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
  Partial cp of "Initial boilerplate for an updatable graphics jar"
2021-03-31 16:13:13 +00:00
John Reck
480a829238 Add more OWNERs for graphics team
Test: this
Change-Id: I97569c916a46f9f9c4d97d3278a7048f140189ba
2021-03-31 11:56:27 -04:00