Commit Graph

1415 Commits

Author SHA1 Message Date
Anton Hansson
66ce308ca5 Merge "Re-submit "Create all variants of stubs for wifi"" 2020-02-22 11:03:50 +00:00
Anton Hansson
5f71338d8f Merge "Remove FrameworksCoreTests dep on framework-all" 2020-02-22 11:00:50 +00:00
Anton Hansson
7c2f73b4ac Remove FrameworksCoreTests dep on framework-all
Make it use framework-statsd directly rather than framework-all.
Note that this is a problem on its own: the problematic tests
should be separated from the monolith tests and moved into the statsd
dir.

Also clamp down on framework-all visibility to avoid anyone else
addinga dependency on this problematic library.

Bug: 149928788
Bug: 149906971
Test: m
Change-Id: Ic819b90911220032130c3f8a01b612edd7fa3ecc
2020-02-21 15:49:55 +00:00
Anton Hansson
e399f13a75 Merge "Remove ike-srcs from updatable srcs" 2020-02-21 12:15:17 +00:00
Anton Hansson
21f0ed2a0a Re-submit "Create all variants of stubs for wifi"
Use sdk_version: module_current instead.

This reverts commit d20f03011f.

Test: m
Test: build/soong/soong_ui.bash --make-mode dist ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I36cf007a4813027721dfb6389e10cf95085f85e4
2020-02-21 11:24:38 +00:00
Anton Hansson
358a2d2c99 Merge "framework-wifi: Stop linking all frameworks/base/core/java AIDLs" 2020-02-21 11:01:15 +00:00
Les Lee
427a30c8f7 Merge "wifi: Use long to replace int for softap feature set" 2020-02-21 06:07:13 +00:00
Yan Yan
e2ff46a5e3 Merge "Dynamically include ike-stubs in services.core.unboosted" 2020-02-21 04:10:42 +00:00
Chris Ye
e078ee507e Merge "Add native Thermal Throttling API to libandroid." 2020-02-21 03:21:18 +00:00
evitayan
24c8c12926 Dynamically include ike-stubs in services.core.unboosted
Previously because compilation will preferentially uses the
ike-stubs statically included in framework.jar,
FrameworksIkeTests has to jarjar the ike_test.jar. Otherwise
the tests will use the ike-stubs and cannot access to the hidden
implementation.

This commit removes ike-stubs in framework-minus-apex and framework
and statically includes it in services.core.unboosted.

In this way, system server can still compile against ike.jar and
at the same time FrameworksIkeTests does not need to jarjar the
ike_test.jar anymore

Bug: 145995723
Test: build, flash, boot, loaded in system server
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Change-Id: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
2020-02-20 18:03:50 -08:00
Anton Hansson
50fc4f6eb0 Remove ike-srcs from updatable srcs
They needn't be here, because they don't contribute to the
bootclasspath. Modules should only be depended on via stubs,
except for current.txt generation.

Test: m
Change-Id: Id9e43205fe1badace66fc580effd77e4863265d0
2020-02-20 17:26:05 +00:00
David Su
72f9d6352e framework-wifi: Stop linking all frameworks/base/core/java AIDLs
Instead only link ParceledListSlice.aidl,
which is the only one used by
framework-wifi.

Bug: 149127842
Test: "couldn't find import for class android.content.pm.ParceledListSlice"
no longer appears when building

Change-Id: Ie9f67c58c3694bbf1f45ae8e1d99e6e65fbc3163
2020-02-20 15:06:24 +00:00
Automerger Merge Worker
a74588fd6e Merge "Remove unused filegroup" am: 3ff1caf424 am: 281f4e4ef9 am: f4255ac0d6
Change-Id: I67ad167574d85124ee5595b321a522be81cb8dcf
2020-02-20 12:56:18 +00:00
Anton Hansson
3ff1caf424 Merge "Remove unused filegroup" 2020-02-20 12:14:36 +00:00
Anton Hansson
1254f6740a Merge "Remove obsolete subdirs and optional_subdirs" 2020-02-20 11:35:42 +00:00
Anton Hansson
7d0b293053 Merge "Remove wifi aidl-exports from framework-aidl-export-defaults" 2020-02-20 10:41:17 +00:00
lesl
d41a299561 wifi: Use long to replace int for softap feature set
Bug: 149871866
Test: atest frameworks/base/wifi/tests/
Change-Id: I58a408150325054af809bdb18c77748ead3a0b17
2020-02-20 17:41:40 +08:00
Chris Ye
48dbcaae41 Add native Thermal Throttling API to libandroid.
Add native thermal manager API of thermal mananger service into
libandroid. Export Thermal API as NDK library.

Bug: 137151587
Bug: 136285293
Test: build, atest thermalmanager-test atest CtsThermalTestCases

Change-Id: Ia49fb2133624ffcd6168af804ae612ef2bb190f2
2020-02-19 16:25:25 -08:00
Winson Chiu
633cd037f7 Merge changes from topics "package-parsing-v2.1", "parsing-parsed-package-split"
* changes:
  Remove AndroidPackageWrite
  Migrate to new ParsedComponents and ParseResult
  Split ParsedComponents
  Add ParseResult infrastructure
  ParsingPackage/ParsedPackage test code migration
  ParsingPackage/ParsedPackage split source migration
  Important migration for new ParsingPackage/ParsedPackage split
  Separate ParsingPackage into core and ParsedPackage into server
2020-02-19 22:16:15 +00:00
David Su
0792b12f99 Merge "CurrentTimeMillisLong: Move to framework-annotations" 2020-02-19 21:06:34 +00:00
TreeHugger Robot
5f88ef88e2 Merge "Revert "Add configs for ePDG"" 2020-02-19 19:52:05 +00:00
Anton Hansson
c4db73c4da Remove wifi aidl-exports from framework-aidl-export-defaults
Nothing should be depending on sources from the wifi module.

Bug: 149821758
Test: m
Change-Id: I4e7a0198003c8de29895b84ebdf07dae2109d472
2020-02-19 17:07:27 +00:00
Anton Hansson
305fb2fc1a Remove obsolete subdirs and optional_subdirs
I was looking for documentation of what these mean, but discovered
that these attributes have been obsolete for years.

Test: m
Change-Id: Ifcf47e99d22b1546780968d1030f835173612a27
2020-02-19 16:37:42 +00:00
Anton Hansson
7ede3dd2b3 Remove obsolete subdirs and optional_subdirs
I was looking for documentation of what these mean, but discovered
that these attributes have been obsolete for years.

Test: m
Change-Id: Ifcf47e99d22b1546780968d1030f835173612a27
Merged-In: Ifcf47e99d22b1546780968d1030f835173612a27
2020-02-19 15:27:58 +00:00
Anton Hansson
646cc67c49 Remove unused filegroup
Test: m
Change-Id: Ia83b310abdd9fb2a1343fe899758584510c5d421
2020-02-19 13:33:36 +00:00
Remi NGUYEN VAN
2d14a4b3e0 Fix usage of annotations in TetheringLib
Annotations such as @SystemApi cannot be jarjared to a different
package, as the members would not match the system API declarations.

Instead, only build against the annotations from
framework-annotations-lib, but do not include them as classes in the
output jar; annotations are not required to be available to the
classloader at runtime.

Test: builds, boots, tethering working
Bug: 147812912
Fixes: 148609988
Change-Id: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
Merged-In: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
2020-02-19 16:32:26 +08:00
Winson
5e0a1d5ce2 ParsingPackage/ParsedPackage split source migration
Part of the Parsing/ParsedPackage split into core/server.

This migrates any core/services source with trivially reviewable
changes. Import changes, moving files around, or generally
small single line changes scattered throughout all code that
depended on the old state of the package code.

Bug: 135203078

Test: enumerated in first commit of change ID
		Ib4fe51d729a56bfb0ea1316e577358ba0dfceccf

Change-Id: If091641a81be2d943d1d3e4a3d654e200d0ce59d
2020-02-19 00:29:05 -08:00
Brian Duddie
913b79a6ac Merge changes from topic "contexthub_hal_update"
* changes:
  Update the Contexthub with location setting changes
  Create IContextHubWrapper
2020-02-19 07:31:31 +00:00
markchien
8cf2a5588b Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050
2020-02-19 15:10:44 +08:00
David Su
7751734bb7 CurrentTimeMillisLong: Move to framework-annotations
Move CurrentTimeMillisLong to
framework-annotations since it is used by other
modules besides MediaProvider (e.g. Wifi).

Bug: 149605228
Test: compiles
Change-Id: If5a3c77391a63eb11e682b7654864c2bef8b87d4
2020-02-18 18:10:07 -08:00
Dheeraj Shetty
08f001595c Revert "Add configs for ePDG"
This reverts commit 81a4f4ee28.

Reason for revert: b/149531704  IKE @SystemApi constants re-exposed (duplicate) as Public API
Bug that introduced the original change(ag/9987427): b/140873586

Bug: 149531704
Change-Id: I7d521269085a5937bd9252438571d5d45f40a1b2
2020-02-18 15:10:01 -08:00
Anna Trostanetski
825a08e10d Merge "Remove media-provider compat config from system image." 2020-02-17 12:54:08 +00:00
Mark Chien
0a3c802e02 Merge "Fix usage of annotations in TetheringLib" 2020-02-17 11:00:55 +00:00
Anthony Stange
521a905c97 Create IContextHubWrapper
IContextHubWrapper will be used to help abstract implementation-specific
features of different versions of the Contexthub HAL to make it easier
for the framework to interact with the HAL.

Bug: 135951924
Test: compile
Change-Id: I827b744b9f91298848105c881dfd0dc3abba61fb
2020-02-13 13:41:44 -05:00
Nikita Ioffe
779d6bee21 Log UserspaceRebootReported atom from system_server
UserspaceRebootLogger class is introduced to encapsulate (tiny) state
machine for logging of userspace reboot.

So far state is stored in a persistent property, but that can be changed
in the future.

Unit tests will be added in a follow-up CL.

Test: adb shell svc power reboot userspace
Bug: 148767783
Change-Id: Ib9e2c6cef7094ccac7862be249d619212f0013fd
(cherry picked from commit d5594e2f901ba7eced97b35da8cf0f0a3f6242bd)
2020-02-12 17:19:14 +00:00
Remi NGUYEN VAN
eb22daaf5b Fix usage of annotations in TetheringLib
Annotations such as @SystemApi cannot be jarjared to a different
package, as the members would not match the system API declarations.

Instead, only build against the annotations from
framework-annotations-lib, but do not include them as classes in the
output jar; annotations are not required to be available to the
classloader at runtime.

Test: builds, boots, tethering working
Bug: 147812912
Fixes: 148609988
Change-Id: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
2020-02-12 03:44:16 +00:00
TreeHugger Robot
32d078ac0a Merge "Use framework-statsd-stubs in frameworks/base/Android.bp" 2020-02-10 05:08:28 +00:00
Hyunyoung Song
8a7c978c57 Merge "Move UiEventLogger related methods into a library so that launcher can depend on it." 2020-02-09 20:43:38 +00:00
Jiyong Park
a21b20414f Use framework-statsd-stubs in frameworks/base/Android.bp
The non-updatable part of the platform does not use framework-stats, but
framework-stats-stub. In doing so, some APIs in StatsEvent were made as
SystemApis.

FrameworkCoreTests was also modified to avoid the implicit linking with
'framework.jar' that doesn't have the test-only APIs for statsd. To
disable the implicit linking, sdk_version was set to core_platform and
the dependency to framework.jar was replaced with framework-all.

Bug: 146167933
Test: m
Test: m FrameworkCoreTests
Change-Id: Ic447993a13f74c09fabb04fe32b9b94d78a34ce2
2020-02-08 22:37:04 -08:00
Muhammad Qureshi
555400f13b Add statsd_java_aidl to framework-statsd
Bug: 146578171
Test: m
Change-Id: I9ed1e4ea357e6825dc587f9311ac80c838e5a0b7
2020-02-07 21:14:03 -08:00
atrost
4a3381724f Remove media-provider compat config from system image.
Replaced by putting it in the APEX.

Bug: 142650523
Test: m
Test: flash, inspect device etc folders.
Change-Id: I35ae9f035038ac64911ddf44c9c2293ac67443ba
2020-02-07 18:40:08 +00:00
Stan Iliev
c90438175f Refactor GraphicsStatsService for updateability
Move GraphicsStatsService to android.graphics package.
Move GraphicsStatsService JNI from libservices.core to
libandroid_runtime.
Declare GraphicsStatsService ctor as the only @SystemApi.
Remove MemoryFile usage from GraphicsStatsService, but use
SharedMemory and other SDK APIs instead. This is done to
avoid using unstable API MemoryFile.getFileDescriptor.
Propose new SharedMemory.getFdDup API for next release, which
is hidden for now.
Refactor statsd puller to avoid proto serialization by moving
data directly into AStatsEventList.
"libprotoutil" is added as a static dependancy to libhwui, which
should be fine because its implementation does not link anything.

Bug: 146353313
Test: Ran "adb shell cmd stats pull-source 10068"
Test: Passed unit tests and GraphicsStatsValidationTest CTS
Change-Id: If16c5addbd519cba33e03bd84ac312595032e0e1
2020-02-07 12:27:07 -05:00
Hyunyoung Song
a28623b809 Move UiEventLogger related methods into a library so that
launcher can depend on it.

Bug: 149052947
Test: system.img builds

Change-Id: I8a33bb9bf1732b8dd283645d7ac38f92b62cc7e8
2020-02-07 00:15:00 -08:00
markchien
2c153703e4 Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
2020-02-07 00:27:26 +08:00
TreeHugger Robot
43bb1463c8 Merge "Proto message for "dumpsys sensorservice --proto"" 2020-02-06 04:19:25 +00:00
Mike Ma
a47ad7266c Proto message for "dumpsys sensorservice --proto"
Add SensorServiceProto for protobuf dumpsys of sensorservice. Primarily
used by incident service to capture an incident report proto.
Also add a gensrc rule to generate cpp headers of frameworks proto to
be used by native services like sensorservice. Added "static" qualifier
to a few generated fields in the header to avoid linker conflict.

Command to invoke (any of the following after lunch and env setup):
$ adb shell dumpsys sensorservice --proto
$ adb shell incident 3053
$ incident_report 3053

Bug: 146086105
Test: Execute the above commands and compare the output against dumpsys
      sensorservice

Change-Id: I282ff37bd3e845464d0693d69fc0d82943cc9855
2020-02-05 10:10:47 -08:00
Anton Hansson
15e001d28d Merge "Revert "Create all variants of stubs for wifi"" 2020-02-05 09:47:48 +00:00
Anton Hansson
d20f03011f Revert "Create all variants of stubs for wifi"
This reverts commit 722a360609.

Exempt-From-Owner-Approval: clean revert
Reason for revert: Broke the apps build

Change-Id: I14e25b924d7415a53a5f5994054f4fd5d9ff99cc
2020-02-05 09:46:53 +00:00
TreeHugger Robot
c9b0ff4ed3 Merge "Reduce the visibility scope of framework-minus-apex" 2020-02-05 09:23:49 +00:00
Anton Hansson
d90e2fed71 Merge "Create all variants of stubs for wifi" 2020-02-05 09:03:14 +00:00