Commit Graph

1282 Commits

Author SHA1 Message Date
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
David Su
511a814a10 Jarjar utils into framework-wifi and share with wifi-service
Jarjar utility classes used by both framework-wifi
and wifi-service into framework-wifi and allow
them to be referenced by wifi-service.

Create framework-wifi-util-lib which contains
utility classes that we will copy into the Wifi module.
It is statically linked into framework-wifi and
dynamically linked by wifi-service.

Create framework-wifi-pre-jarjar to allow
wifi-service to use the pre-rename symbols in
framework-wifi-util-lib.

In essence:
1. build framework-wifi-util-lib,
  framework-wifi-pre-jarjar, wifi-service-pre-jarjar
  using original symbol names.
2. rename everything afterwards at the same time.

This ensures that all symbol names are consistent at
each step in the build process.

Bug: 142886292
Test: device boots up and connects to wifi
Change-Id: I27b3519657d652787714b4b34de6cdbfef2a81e4
2020-01-12 18:32:32 -08:00
evitayan
0efc7400a3 Make mainline IKE statically include Android StateMachine
This commit adds Android StateMachine source files to the
filegroup that is statically included in mainline IKE.

Bug: 146457741
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I2549299350090ae02e9ccc965663aeb2b311c6d8
2020-01-10 18:34:07 -08:00
TreeHugger Robot
5927ed17a6 Merge "Expose HWUI metrics via statsd" 2020-01-10 17:42:11 +00:00
Stan Iliev
637ba5e8da Expose HWUI metrics via statsd
Add atom definition for HWUI stats. Implement a C++
statsd puller inside GraphicsStatsService service.
GraphicsStatsService has new private API, which
returns a serialized proto with HWUI stats grouped
by application package and version.

Test: Ran "adb shell cmd stats pull-source 10068"
Test: Ran "statsd_testdrive 10068" and it looks OK
Bug: 142665516
Change-Id: I400c0dbf9e25181d36f9018688b03d86839ac3de
2020-01-10 10:50:25 -05:00
Jiyong Park
90247c8a1c Platform shouldn't directly link to jars in APEXes
The non-updatable part of the platform shouldn't directly link to the
boot jars in APEXes. Ensure this by

1) setting the visibility property for the boot jars so that they are
not visible to non-APEX modules and
2) setting the apex_available property so that the boot jars are only
built for the corresponding APEXes, but not for others.

Bug: b/146167933
Bug: b/146218515
Bug: b/147200698
Test: m
Change-Id: I251fabd773bc31f46d572d143c72dd9162f3f0a6
Merged-In: I251fabd773bc31f46d572d143c72dd9162f3f0a6
2020-01-10 15:15:24 +00:00
Anton Hansson
4226274bf9 Merge "Platform shouldn't directly link to jars in APEXes" 2020-01-10 15:12:17 +00:00
Mathew Inwood
bb11a52852 Merge "Remove duplicated compat config." 2020-01-10 09:11:56 +00:00
Automerger Merge Worker
106fa497e5 Merge changes from topic "include-uiccapptype" am: 614fd1b51b am: 237fc783cb am: 37305cfcb0
Change-Id: I70133db7fa904914b89e53e4e8db86ce4e5cecd2
2020-01-10 00:46:48 +00:00
Automerger Merge Worker
a5d7bf75ad Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" am: 17d04f08d6 am: b5189ed2d9 am: 6aa3ba16c3
Change-Id: I3c2b6dbe514a9f41d27c71b4f76484d801cb92e8
2020-01-10 00:27:55 +00:00
Yan Yan
614fd1b51b Merge changes from topic "include-uiccapptype"
* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
2020-01-10 00:23:28 +00:00
Yan Yan
17d04f08d6 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 2020-01-09 23:42:59 +00:00
Mathew Inwood
503371e2a1 Remove duplicated compat config.
Since the build now merges compat config properly, including these extra
platform_compat_config rules results in duplicated config on the device.

Test: m
Test: Manually inspect contents of /etc/compat_config
Change-Id: I9a0e9ed43d16ae44ecc9e5a5d6984be2332713c5
2020-01-09 15:30:11 +00:00
Automerger Merge Worker
d50c3fc165 Merge "Fix some @hide usage in Tethering(Cont.)" am: 6a95399667 am: 389c46b7cb am: 777ca2c5d2
Change-Id: Ia889b93625bbe2ec24b634ac25ca72cb1b44a3de
2020-01-09 09:41:18 +00:00
Jiyong Park
c81df3f859 Platform shouldn't directly link to jars in APEXes
The non-updatable part of the platform shouldn't directly link to the
boot jars in APEXes. Ensure this by

1) setting the visibility property for the boot jars so that they are
not visible to non-APEX modules and
2) setting the apex_available property so that the boot jars are only
built for the corresponding APEXes, but not for others.

Bug: b/146167933
Bug: b/146218515
Bug: b/147200698
Test: m
Change-Id: I251fabd773bc31f46d572d143c72dd9162f3f0a6
2020-01-09 17:52:55 +09:00
Mark Chien
6a95399667 Merge "Fix some @hide usage in Tethering(Cont.)" 2020-01-09 08:47:07 +00:00
markchien
87d3f7d4f1 Fix some @hide usage in Tethering(Cont.)
Using alternative way to fix @hide usage. Do not have API change.

Bug: 144814072
Test: buid
Change-Id: Ia23e319ad3779318471d01cbfa17b8c6df4960d3
2020-01-09 05:40:42 +00:00
evitayan
996aa2a146 Make mainline IPsec(IKE) to statically include @UiccAppType
This commit adds android.telephony.Annotation to
framework-ike-shared-srcs so that mainline module IPsec(IKE) can
statically include it.

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I58b733fd6c020b76313b750e18eebb7bd0c12e7c
2020-01-08 14:17:31 -08:00
Roshan Pius
1924bd4446 Merge "wifi: Copy BasicShellCommandHandler for shell command parsing" 2020-01-08 21:57:53 +00:00
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 5b97269cff)
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