Commit Graph

1319 Commits

Author SHA1 Message Date
David Su
c1728f1613 Merge changes from topics "framework-jar-build-against-framework-wifi-stubs", "settings-suggestions-apis"
* changes:
  framework.jar - include framework-wifi-stubs instead of framework-wifi (Attempt 2)
  Expose WifiNetworkSuggestion.getWifi/PasspointConfiguration()
2020-01-21 17:05:24 +00:00
David Su
9e208ff677 Merge changes from topic "revert-10057725-IDGRNKQGYI"
* changes:
  Build framework-wifi against core_current & framework-system-stubs (Attempt 2)
  Fully qualify android.net.wifi.ScanResult
2020-01-21 17:04:30 +00:00
Automerger Merge Worker
310f576b7f Merge "Add Framework APIs for Identity Credential." am: 2fb5112a35 am: 70485380f7 am: 6079e88fae
Change-Id: Iec2c6c1ec28b5697b8d2b444081a3240bea2af9e
2020-01-21 15:12:56 +00:00
Treehugger Robot
2fb5112a35 Merge "Add Framework APIs for Identity Credential." 2020-01-21 14:38:14 +00:00
Automerger Merge Worker
b4bae8a503 Merge "Set the visibility of framework-core-sources-for-test-mock" am: a77e4c3ad3 am: af31927d4d am: d0ba5601aa
Change-Id: I3d008d2633785d74a560b7832158caadc4eef8bc
2020-01-21 09:44:41 +00:00
David Zeuthen
045b6de975 Add Framework APIs for Identity Credential.
The Identity Credential APIs provides an interface to a secure store
for user identity documents.  These APIs are deliberately fairly
general and abstract.  To the extent possible, specification of the
message formats and semantics of communication with credential
verification devices and Issuing Authorities (IAs) is out of scope for
these APIs.

The Identity Credential APIs rely on user authentication to protect
data elements in credentials which is implemented through
auth-tokens. This CL contains changes to CryptoObject to allow this.

Bug: 111446262
Test: CtsIdentityTestCases
Change-Id: I48f21a561b762d86c9ca8d229962782572412f47
2020-01-20 15:56:57 -05:00
Henry Fang
43cab92abe Framework support cas@1.2
Test: Manual
bug: 141783130
Change-Id: I62d42ad51444b8d58282f5d6992ba6f2169dd6d3
2020-01-19 22:28:44 +00:00
David Su
439175f1b9 Build framework-wifi against core_current & framework-system-stubs (Attempt 2)
At this point framework-wifi will not depend on
any @hide APIs.

Previous attempt broke git_master/apps target.

Bug: 140299412
Change-Id: Idf4c1d22f96c01ae9c117742dcfe83929ab545ae
Test: boots up and connects to Wifi
2020-01-17 17:15:58 -08:00
David Su
298cd36e58 framework.jar - include framework-wifi-stubs instead of framework-wifi (Attempt 2)
Stop exporting @hide APIs from framework-wifi
to framework.jar by including framework-wifi-stubs
instead. At this point no code is allowed to call @hide APIs
defined in framework-wifi unless they have an explicit
exemption.

Attempt 1 broke the build, trying again.

Bug: 140299412
Change-Id: I3eecb0a5f6b1c0be85d684d190465d591994d99f
Test: boots up and connects to Wifi
2020-01-17 15:12:36 -08:00
Xiangyu/Malcolm Chen
179e23dfe9 Merge "Copy @hide util files into framework-telephony." 2020-01-17 21:38:39 +00:00
David Su
36a63e59a5 Merge "framework-wifi: clean up AIDL exports (Attempt 2)" 2020-01-17 21:06:49 +00:00
TreeHugger Robot
19d17f359d Merge "Add flag to stats-log-api-gen for WorkSource." 2020-01-17 19:32:45 +00:00
David Su
c651359200 framework-wifi: clean up AIDL exports (Attempt 2)
Remove AIDL exports to not leak internal
implementation as AIDL is not an official API
of the Wifi module.

Previous attempt broke the build.

Bug: 147757606
Change-Id: I2edeeccf83b9460881c5d4ccc6bd5d6e3befa700
Test: compiles
2020-01-17 11:05:33 -08:00
Muhammad Qureshi
ad94425b15 Add flag to stats-log-api-gen for WorkSource.
As part of getting rid of StatsLogInternal and moving every atom to be
logged from a module, this CL addresses 2 issues:
1. Add WorkSource logging to modules.
2. Gate WorkSource logging via a CLI flag to prevent WorkSource methods
from being included in modules that are Mainline modules and can't have
@hide calls.

Bug: 147541828
Test: m
Test: atest android.cts.statsd.atom.UidAtomTests

Change-Id: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
2020-01-17 08:36:52 -08:00
Jiyong Park
673e298ba5 Set the visibility of framework-core-sources-for-test-mock
It is visible only to frameworks/base/test-mock as its name says.

Bug: N/A
Test: m
Change-Id: I0ad1bfe038f8b494bfbb0e0015cfe0565934a229
2020-01-17 16:15:35 +09:00
David Su
c976e8663a Build framework-telephony-stubs against core_current
Build framework-telephony-stubs against
core_current so that it can be linked by
framework-wifi, which will also be built
against core_current.

Bug: 140908357
Test: device boots up
Change-Id: I20bf13a100d6dfca06c4e108a837987234ec2b38
2020-01-16 20:56:18 -08:00
Roshan Pius
364042007d Merge "wifi-service: Jar-Jar net util sources" 2020-01-17 02:04:14 +00:00
Roshan Pius
02432980d0 wifi-service: Jar-Jar net util sources
Bug: 135998869
Test: Compiles
Test: Number of compile errors when compiled against system_current
reduces.

Change-Id: I67d2a435e8fd8c823b6cb1bf4becb01362dcc5e0
2020-01-16 14:35:43 -08:00
Malcolm Chen
58b59a5ea4 Copy @hide util files into framework-telephony.
Also add jarjar rules for them.

Bug: 140908357
Test: build
Change-Id: I4411be058a002a4339ea563f444de9f4c0b67f23
2020-01-16 14:32:50 -08:00
Chen Xu
546ce5e45e modularize telephony-framework from framework.jar
Bug: 140908357
Test: Build & Manaul
Change-Id: Idd4cbdb84247b98072b6ebc00a37168fde6fbbaa
2020-01-16 14:32:50 -08:00
Anton Hansson
b2f709db1d Add <extension-sdk> manifest tag inside <uses-sdk>
This allows apps to specify the minimum versions they need
of extension sdks, and fails install if they aren't met.

There is additional work required to prevent local rollbacks
from triggering a downgrade of SDK versions after an install.

Bug: 137191822
Test: atest PackageParserTest
Exempt-From-Owner-Approval: PS4 was approved
Change-Id: If61ae6c67ceb752bec6876006a29e52b996901e7
2020-01-16 11:59:52 +00:00
Hai Zhang
82a6227fc7 Allow adding framework and service java code into permission APEX.
Along with two empty classes to make build happy.

Bug: 136503238
Test: presubmit
Change-Id: Ib706a7ac4d09374ce220961f9439f712a38f7c0c
2020-01-15 13:56:17 -08:00
David Su
1c83ec6639 Merge "Revert "framework-wifi: clean up AIDL exports"" 2020-01-15 20:57:58 +00:00
David Su
03e42a6d68 Revert "framework-wifi: clean up AIDL exports"
This reverts commit 537d8d9e2b.

Reason for revert: Broke build

Change-Id: Ia69c60050203b1124baf8d1304e837854a1f8bc9
2020-01-15 20:50:43 +00:00
Automerger Merge Worker
222a6bbe4a Merge "Statically link AsyncChannel/AsyncService in telephony" am: ff3210b045 am: 08b5032d41 am: 8ed7da2b52
Change-Id: If820b7cb78648834a4f62ab14bafa5317effbe80
2020-01-15 20:10:09 +00:00
David Su
c23eeb815c Merge "framework-wifi: clean up AIDL exports" 2020-01-15 19:47:25 +00:00
Treehugger Robot
ff3210b045 Merge "Statically link AsyncChannel/AsyncService in telephony" 2020-01-15 19:35:22 +00:00
Mike Ma
73287d1ab3 Merge "Incident Report Extension API" 2020-01-15 19:27:55 +00:00
Automerger Merge Worker
723cf79d04 Merge "Statically include @StringDef in IKE module" am: 259781e84a am: 3cd4501529 am: f49f206a02
Change-Id: Icb47ca3f788fd1ba6410156ae754ef995bf8f609
2020-01-15 18:41:29 +00:00
Yan Yan
259781e84a Merge "Statically include @StringDef in IKE module" 2020-01-15 18:16:00 +00:00
David Su
537d8d9e2b framework-wifi: clean up AIDL exports
Remove AIDL exports to not leak internal
implementation as AIDL is not an official API
of the Wifi module.

Bug: 140299412
Test: device boots up and connects to wifi
Change-Id: I52bb63a2ae9df2c2f9e9868a20c66418a420e3b6
2020-01-14 16:47:19 -08:00
Mike Ma
643de9238b Incident Report Extension API
Add an API for priv and system app to register a dump callback with
Incident Service.

Bug: 145924375
Test: Register a callback dumping a string. Capture an incident report
      and verify that the customized section exist.

Change-Id: I6fff6c1ee97e25963068d284ba37adce1bb5ec31
2020-01-14 16:45:33 -08:00
Meng Wang
3043dac37a Statically link AsyncChannel/AsyncService in telephony
Bug: 137202333
Test: make
Change-Id: I14512b3c65d9a0a0ddb08c9e69a072141accfab5
2020-01-14 14:21:50 -08:00
Yan Yan
a32fcb74e5 Merge "Add module IPsec(IKE) stubs and sources to platform" 2020-01-14 18:17:24 +00:00
evitayan
bddbfb03a8 Statically include @StringDef in IKE module
Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I85216a62ff56e1d635d486cd5b3c2a63ee93843c
2020-01-13 21:31:00 -08:00
Alexander Dorokhine
0e8fa4e65b Add a SetSchema API and builders.
They directly construct the proto in frameworks.jar.

The API is not yet implemented.

Test: atest CtsAppSearchTestCases
Bug: 145635424
Change-Id: I4f708fa845a87f171ace437788d2c45161fc38ff
2020-01-13 20:22:20 -08:00
Benedict Wong
7f58c0d848 Add module IPsec(IKE) stubs and sources to platform
As IKE is used in the frameworks for IKEv2/IPsec VPNs, IKE stubs
must be built and added to the frameworks build process

Bug: 147096727
Test: build, flash, boot
Test: FrameworksNetTests, FrameworksIkeTests passing
Change-Id: I51aad4ab800442d018bb170225c114a4ae5ea3b1
(cherry picked from commit 589b6ffe7c)
Merged-In: I51aad4ab800442d018bb170225c114a4ae5ea3b1
2020-01-13 20:16:56 -08:00
TreeHugger Robot
3ead80930b Merge "Revert "Use framework-appsearch-stubs instead of framework-appsearch"" 2020-01-14 03:56:04 +00:00
Alexander Dorokhine
3e2051adbd Revert "Use framework-appsearch-stubs instead of framework-appsearch"
This reverts commit 476008fb75.

Reason for revert: There are ~20 pending CLs in this project in various
stages of review, and this CL causes widespread breakages in many parts
of our work (including CTS tests, coretests and servicetests) and blocks
multiple team members. Given the closeness of the API review deadline
and the fact that framework-appsearch is empty at HEAD (so building at
head is not indicative that the infrastructure supports the project's
needs), would it be possible to hold off on building against the stubs
or now until the various tests are set up at HEAD? ETA for getting code
submitted in this project: 1 day.

Change-Id: Ie2ea82f5ee41861e93f5bdf34ceae1417328d26a
2020-01-14 01:25:54 +00:00
Automerger Merge Worker
dcc7e72474 Merge "Make mainline IKE statically include Android StateMachine" am: c0f518b2d3 am: 8f1fd3ba1b am: b51fd3851b
Change-Id: I530b569fa95097f729d4b22c70ee0a7d8151e093
2020-01-14 00:46:29 +00:00
Automerger Merge Worker
6f63927c76 Merge "Add net-utils-framework-common-srcs to framework" am: 107fe4130e am: 1fc55f0917 am: 74c545bbf3
Change-Id: I9cda119a53029a118c594b45df664de00f419a93
2020-01-14 00:46:03 +00:00
Yan Yan
c0f518b2d3 Merge "Make mainline IKE statically include Android StateMachine" 2020-01-14 00:10:01 +00:00
Chalard Jean
107fe4130e Merge "Add net-utils-framework-common-srcs to framework" 2020-01-14 00:09:22 +00:00
David Su
a4d4f94e21 Merge changes from topics "wifi-copy-xmlutils", "wifi-systemmessageproto"
* changes:
  wifi-service: Remove jarjar of XmlUtils
  Statically link SystemMessageProto into wifi-service
2020-01-13 20:21:26 +00:00
David Su
433d603863 Merge changes from topics "framework-wifi-jarjar", "framework-wifi-jarjar-more-classes"
* changes:
  SystemService annotation: Remove import of Context
  Jarjar more classes into framework-wifi
  Jarjar utils into framework-wifi and share with wifi-service
2020-01-13 18:04:08 +00:00
Aaron Huang
c4081b2898 Add net-utils-framework-common-srcs to framework
Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest NetworkStaticLibTests
      atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ic7b5b07f0e95068eb53f54ced1fbc52743a7a5cd
2020-01-13 23:33:35 +08:00
Artur Satayev
bc3d8b9071 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
Jiyong Park
476008fb75 Use framework-appsearch-stubs instead of framework-appsearch
The framework.jar now uses framework-appsearch-stubs instead of the
implementation jar framework-appsearch. As a result, it no longer
exports private APIs of framework-appsearch.

This change also refactors the droidstubs module so that we use the
metalava args that are consistent with other stubs.

Bug: b/146218515
Test: m
Change-Id: Ia4ad349bc6297891f7cc23e2528a296d75326c5c
2020-01-13 13:21:24 +09:00
David Su
05d65140d9 wifi-service: Remove jarjar of XmlUtils
Instead, copy XmlUtils source file into
wifi-service to remove XmlUtils usage of @hide
libcore.util.HexEncoding.

Bug: 147559755
Test: boots up and connects to wifi
Change-Id: I4ec92bf31d0ebe616658410f5101b726452fb180
2020-01-12 18:35:01 -08:00
David Su
369c920552 Jarjar more classes into framework-wifi
Jarjar annotations, Inet4AddressUtils,
and HandlerExecutor into framework-wifi.jar.

Statically link Wifi hardware constants as well.

Bug: 142886292
Test: boots up and connects to wifi

Change-Id: Ib0e2e55ae5158d65dd012511ac3d4d2a73225b57
2020-01-12 18:34:53 -08:00