Commit Graph

1266 Commits

Author SHA1 Message Date
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
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
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 0d7e86d03c)
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 92721349d9)
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