1401 Commits

Author SHA1 Message Date
evitayan
e22e47f48e Allow mainline IPsec(IKE) to statically include @PolicyDirection
@PolicyDirection was hidden API defined in IpSecManager and
mainline module IPsec(IKE) needs to depend on it.

To remove this hidden API dependency, this commit:
- Moves definition of @PolicyDirection to a separate class
- Creates sharing filegroup framework-ike-shared-srcs for mainline
  IKE and include PolicyDirection.java

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: Ic6d7c06d4b92e16a9a65430365c9acc73932147b
2020-01-08 13:53:14 -08:00
Roshan Pius
3032c893f8 wifi: Copy BasicShellCommandHandler for shell command parsing
Bug: 147344816
Test: Compiles
Change-Id: If461f6678be22230d201b27eea6f5b81b88c0e30
2020-01-08 11:10:15 -08:00
Yan Yan
28cf3a84ea Merge "Add module IPsec(IKE) stubs and sources to platform" 2020-01-08 18:03:23 +00:00
Anton Hansson
87743c6d55 Rename sdkext module to sdkextensions
It's a better name.

Bug: 137191822
Test: presubmit
Change-Id: Icc39779d49bf31f911f9f72bd7610e84c5f49466
Merged-In: Icc39779d49bf31f911f9f72bd7610e84c5f49466
(cherry picked from commit 5b97269cffa587d1c1d73163a9cabb0cc8c7ec05)
2020-01-08 11:42:58 +00:00
Anton Hansson
5b97269cff Rename sdkext module to sdkextensions
It's a better name.

Bug: 137191822
Test: presubmit
Change-Id: Icc39779d49bf31f911f9f72bd7610e84c5f49466
2020-01-08 10:20:33 +00:00
Benedict Wong
589b6ffe7c 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
2020-01-08 05:03:42 +00:00
Automerger Merge Worker
46b3589988 Merge "Fix some @hide usage in Tethering" am: b763432e14 am: aff6974b16 am: b43f5315ca
Change-Id: I94fc3652055c3ddbeb807c88b70d7fc833d69c3b
2020-01-08 01:27:25 +00:00
markchien
986750b327 Fix some @hide usage in Tethering
Using alternative way to replace some @hide API.

Bug: 144814072
Test: build, flash, boot
      atest TetheringTests

Change-Id: I1e12d69db1ad91dff553e142e17c6a70808e1639
2020-01-07 21:29:52 +08:00
Automerger Merge Worker
79fe3e63d8 Merge "Make TokenBucket available to the network stack" am: a6a681768c am: 0d25ca0ffd am: c1c1a355f0
Change-Id: Ifcd3c9562bdec26406e59f6aef5c28d308204909
2020-01-07 07:32:54 +00:00
Treehugger Robot
a6a681768c Merge "Make TokenBucket available to the network stack" 2020-01-07 06:57:46 +00:00
TreeHugger Robot
eb8f8834ee Merge "Move media/* to media/framework/" 2020-01-07 00:55:24 +00:00
TreeHugger Robot
764a64e1e4 Merge "Hide framework-minus-apex" 2020-01-06 16:01:40 +00:00
Jiyong Park
212d2e8668 Hide framework-minus-apex
framework-minus-apex is the jar implementing APIs that the non-updatable
part of the framework provides. It shouldn't be used by modules that are
unbundled. Currently, several modules are using it directly because they
haven't finished clearing their private API usages. Until the work is
finished, allow framework-minus-apex only for those known modules.

Bug: 147128803
Test: m
Change-Id: I09204b7d600a4d0cc1f6d248df6c813bfb8bae01
2020-01-06 23:48:08 +09:00
Dongwon Kang
dd65269f9f Move media/* to media/framework/
Bug: 146583113
Test: build and boot
Change-Id: If04512dc35822529113934ae35ad527d28c66c09
2020-01-03 14:05:05 -08:00
Sungsoo Lim
420c2fc155 Move media/apex to apex/media
And fix some lint warnings.

Test: build & boot
Change-Id: Ib59aa788b02e5bf77dd1355766adbb57860cf737
2020-01-03 23:10:32 +09:00
Hall Liu
aa4398e9ea Copy BasicShellCommandHandler into Telephony
Make a copy at compile time since we need to use it as a mainline module

Bug: 146834818
Test: manual (adb shell cmd phone help)
Change-Id: I4a2f54a0e926aa7040ba91853ca05f4bf38d25ec
2019-12-24 14:13:25 -08:00
johnson.yeh
095b7a0ce8 Make TokenBucket available to the network stack
Bug: b/144826001

Test: Build Pass: OK
Test: Power ON/OFF: OK
Test: Verify CPU loading improvement: OK

Change-Id: I75d55c3e53fce57e50533dc74af3381a6cee4b96
2019-12-23 19:50:51 +08:00
TreeHugger Robot
a7eba77486 Merge "Remove the unnecessary aidl.include_dirs property" 2019-12-23 02:27:21 +00:00
Anton Hansson
7252d9933a Merge "Stop building against core_platform where possible" 2019-12-22 09:07:32 +00:00
Jiyong Park
7fb4b183d8 Separate modules for API docs and API stubs
frameworks/base/Android.bp became too big. Modularize it into multiple
files for better readability and extensibility.

droidstubs and java_library modules for API stub libraries are moved to
StubLibraries.bp.

droidstubs and droiddoc modules for API documents are moved to
ApiDocs.bp

Also, added some documentation to explain the roles of the many modules
and how they are related with each other.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7
(cherry picked from commit 0d7e86d03c8443cee90096ff0447fd50541d77c3)
Change-Id: I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7
2019-12-22 17:27:49 +09:00
Jiyong Park
5640e1d836 Merge changes I4af73809,Iba6a564a,I3305b71e
* changes:
  Hide com.android.server package with @hide javadoc tag
  Add more enums for the client and process attributes of SystemApi
  SystemApi is parameterized
2019-12-22 08:15:25 +00:00
TreeHugger Robot
07398c0032 Merge "Separate modules for API docs and API stubs" 2019-12-22 08:12:27 +00:00
Jiyong Park
0d7e86d03c Separate modules for API docs and API stubs
frameworks/base/Android.bp became too big. Modularize it into multiple
files for better readability and extensibility.

droidstubs and java_library modules for API stub libraries are moved to
StubLibraries.bp.

droidstubs and droiddoc modules for API documents are moved to
ApiDocs.bp

Also, added some documentation to explain the roles of the many modules
and how they are related with each other.

Bug: N/A
Test: m
Change-Id: I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7
2019-12-22 13:38:17 +09:00
Anton Hansson
791551a70f Stop building against core_platform where possible
This is not a stable API surface, so modules shouldn't be building
against it. Compiling against core_platform also disables link-checking,
which can hide other problems.

Bug: 137191822
Test: m
Change-Id: I7ce7dad8c02b094c565daf8c178bc6f89bb610ef
2019-12-21 08:11:31 +00:00
Alex Buynytskyy
1ecfcece45 Migrating Incremental* APIs to PackageManager APIs.
Step 2, merging Data Loader params.

Test: builds and flashes
Bug: b/136132412

Change-Id: I2102554316dadcdcb49790c133ece110c43c29b3
2019-12-20 06:55:32 -08:00
Mark Chien
2410d67357 Merge "[Tether13] Move TetheringManager into framework" 2019-12-20 13:43:46 +00:00
Jiyong Park
0c5b865cd1 Remove the unnecessary aidl.include_dirs property
framework-internal-utils doesn't have source files. Since nothing is
compiled in the module, the aidl include path is unnecessary.

Bug: N/A
Test: m
Change-Id: I446eaced60b35b09764f762ab5e711a47f822e56
2019-12-20 13:31:58 +09:00
markchien
ae8aa646dc [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-20 10:31:31 +08:00
Jeff Sharkey
40182833f7 Move MediaStore.java inside APEX boundary.
Recent work has paved the way to get MediaStore.java building against
"core_platform", and this change is actually shifting MediaStore.java
inside the MediaProvider APEX boundary.

This involves defining a new "updatable-mediaprovider" library JAR
and ensuring that it's spliced into classpaths where needed to keep
everything building and working.

Note that the MediaProvider APK itself is still bundled, so we're
manually including the MediaStore.java when building that APK so that
we can continue referencing @hide symbols, but there's a STOPSHIP
comment to remove that once we get the APK building against
"system_current".

Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I27ed3fde40751d9ac136a31710c62004b1b8962f
2019-12-19 22:16:00 +00:00
Jiyong Park
63bf3e4d98 Merge "Add updatable_media_stub to framework" 2019-12-19 18:04:54 +00:00
Artur Satayev
c20b82a466 Merge "Use new UnsupportedAppUsage annotation." 2019-12-19 16:55:30 +00:00
markchien
6d06f6d51a [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-19 20:53:06 +08:00
Jiyong Park
025e56e7de Add updatable_media_stub to framework
The module framework is now a build-only library whose purpose is to
provide hidden APIs from the non-updatable part of the platform and APIs
from the modules. Merging updatable_media_stub to framework, like the
stub libraries from other modules.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Ib627523aab44b7c41d27d70c6ae34cda5dc2e27c
(cherry picked from commit 92721349d9ec475b2df3a08775fde0bb3c11ffde)
Change-Id: Ib627523aab44b7c41d27d70c6ae34cda5dc2e27c
2019-12-19 11:57:07 +09:00
TreeHugger Robot
a563214951 Merge "Add updatable_media_stub to framework" 2019-12-19 02:49:13 +00:00
TreeHugger Robot
d8492dbfb2 Merge "Migrating Incremental* APIs to PackageManager APIs." 2019-12-18 21:38:46 +00:00
Artur Satayev
afdb23ab6f 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
2019-12-18 20:44:45 +00:00
Alex Buynytskyy
ea14d19106 Migrating Incremental* APIs to PackageManager APIs.
This is the first step, migrating java parts.
CleanSpec.mk added as a workaround for b/146502407

Test: builds and flashes
Bug: b/136132412

Change-Id: Id0a26aa011b555ea457b5aafe7f5789c36d25bcc
2019-12-18 19:13:39 +00:00
Jeffrey Huang
18e52123ce Merge "Create statsmanager service" 2019-12-18 18:20:25 +00:00
Alex Buynytskyy
5b0c7fa2bd Trying to work around aidl incremental build bug.
Test: builds
Bug: b/136132412
Change-Id: I7519889f6898d7604ee5416d928dc955a4f97edf
2019-12-18 01:47:56 -08:00
Jiyong Park
92721349d9 Add updatable_media_stub to framework
The module framework is now a build-only library whose purpose is to
provide hidden APIs from the non-updatable part of the platform and APIs
from the modules. Merging updatable_media_stub to framework, like the
stub libraries from other modules.

Bug: N/A
Test: m
Change-Id: Ib627523aab44b7c41d27d70c6ae34cda5dc2e27c
2019-12-18 17:26:38 +09:00
Treehugger Robot
f65e0e3181 Merge "framework is not available to APEXes" 2019-12-18 08:24:49 +00:00
Jiyong Park
79242c2d2d framework is not available to APEXes
The modules 'framework', 'framework-minus-apex', 'framework-all' contain
private symbols that shouldn't be accessible to Mainline modules.
Restrict the access by making the framework modules to be accessible
only to the platform (the non updatable part).

Bug: 145796956
Test: m
Merged-In: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9
Change-Id: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9
2019-12-18 05:45:46 +00:00
Automerger Merge Worker
6c4c69d04e Merge "Statically link util classes into Telephony module." am: b713828c17 am: 63345dfc2a am: cf9aa18dd6
Change-Id: I75780ceb2d95dfe73be249f4c617aa9041388f27
2019-12-18 00:58:02 +00:00
Jeffrey Huang
8c1ae5aef8 Create statsmanager service
Bug: 146074170
Test: Manual
Change-Id: Ia96f2df24e660fe3293fb2e873e9050a55398cee
2019-12-17 16:54:11 -08:00
Meng Wang
b713828c17 Merge "Statically link util classes into Telephony module." 2019-12-18 00:28:34 +00:00
Alexander Dorokhine
04a05a8bb2 Move framework-appsearch out of framework.jar.
Test: CtsAppSearchTestCases
Bug: 146218515
Change-Id: I55a8732e54e46877ee448973d735ded2870d9443
2019-12-17 10:41:21 -08:00
Jiyong Park
abe6158431 SystemApi is parameterized
We have decided to reuse the existing annotation @SystemApi for all Java
APIs regardless of whether they are for apps or platform internal
modules. This was because introducing new annotation types every time
when we have to create new API surfaces will only increase the confusion
without giving much benefit.

Instead, to differenciate the different API surfaces of @SystemApi, the
annotation type is parameterized. Specifically, it has to axises.

client: specifies the intended client of the API.

process: specifies the process(es) that the API is available.

The default for client and process are priv-apps and all, respectively,
which corresponds to the today's @SystemApi for privileged apps like
GMS.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 140202860
Test: m
Merged-In: I3305b71e22970e80db95f3daf3d7713603c7d68d
(cherry picked from commit 119afc0695cf7632700119bab62a965793c34fd1)
Change-Id: I3305b71e22970e80db95f3daf3d7713603c7d68d
2019-12-17 17:52:15 +09:00
David Su
130441b131 Create WifiAnnotations and jarjar into framework
@IntDef annotations defined in the Wifi module are
@hide and cannot be referenced from the rest of
framework. Create a separate class for Wifi
annotations that can be jarjar'ed into external
clients.

Bug: 140299412
Test: compiles
Change-Id: I5beac976b4d12fb2c01f46cb46f9c54ab54618ea
2019-12-16 17:16:07 -08:00
David Su
754fcc20c5 Split framework-wifi.jar out of framework.jar
Build framework-wifi against framework-minus-apex.
Build framework-minus-apex against "framework-wifi-stubs".
Build framework.jar against framework-wifi since a few
bundled apps/tests still use @hide Wifi APIs.

framework-minus-apex now only has @SystemApi dependencies
on framework-wifi.

Bug: 140299412
Test: atest FrameworksWifiTest FrameworksWifiApiTests
Change-Id: I3ada1dc7e8186c566cfbf7ad3d3b49878ae9860d
2019-12-16 17:16:07 -08:00
Meng Wang
8532de9d05 Telephony module will staticlly link IState.java
to avoid hidden API dependency.

Bug: 137202333
Test: make
Merged-In: I5a9ddbebadcf6226402f6e4a37ced168fe07d55b
Change-Id: I5a9ddbebadcf6226402f6e4a37ced168fe07d55b
2019-12-16 12:22:01 -08:00