1539 Commits

Author SHA1 Message Date
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 81a4f4ee282ea982c65e8fa6f41869a9ff99bd90.

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 722a3606096055ba1c107a1a3efd126380c9ce87.

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
Anton Hansson
b220618eef Merge "Update references to mediaprovider stubs" 2020-02-05 08:55:08 +00:00
Alex Buynytskyy
716588dec9 Minor renaming: IIncrementalManagerNative -> IIncrementalService.
Manager(client)->Service(server) seems to be easier to understand.

Test: builds
Bug: b/136132412 b/133435829
Change-Id: I3bc447fbf7a7aac917df7b4632def75e0da3f1a0
2020-02-05 01:35:06 +00:00
Anton Hansson
722a360609 Create all variants of stubs for wifi
Add separate publicapi, systemapi and module_libs stubs for wifi, and
use a naming scheme consistent with other modules.

Bug: 147768409
Test: m
Test: m framework-wifi-stubs-{public,system,module_libs_}api
Change-Id: I8b606c440f76349f2406b72c23e3f67b6378d385
2020-02-04 20:26:43 +00:00
Anton Hansson
414dc2fb48 Update references to mediaprovider stubs
Names are changing to match the other modules.

Bug: 147768409
Test: m
Change-Id: I155f8fe433f78333782a33539bff86e672449ff3
2020-02-04 20:25:03 +00:00
Anton Hansson
7cde29c3c3 Merge "Create all variants of stubs for permission" 2020-02-04 14:34:07 +00:00
Jiyong Park
634819c46b Reduce the visibility scope of framework-minus-apex
Bug: 147128803
Test: m
Change-Id: Idae13b37146f0efe82adb8c058c24888c1732d22
2020-02-04 21:20:02 +09:00
Anton Hansson
20a935052a Create all variants of stubs for permission
Add separate publicapi, systemapi and module_libs stubs for permission,
and use a naming scheme consistent with other modules.

Bug: 147768409
Test: m
Test: m framework-permission-stubs-{public,system,module_libs_}api
Change-Id: I0bd870f5418bab55e0507a57c72db1c088f732d2
2020-02-03 19:17:16 +00:00
Anton Hansson
12a07676ed Create all variants of stubs for media
Add separate publicapi, systemapi and module_libs stubs for media,
and rename the updatable_media stubs to framework-media to match
the others. The impl jar still has the name updatable_media.

Bug: 147768409
Test: m
Test: m framework-media-stubs-{public,system,module_libs_}api
Change-Id: I498823de7315f78121975d36d6dc7667a8245085
2020-02-03 19:03:21 +00:00
Treehugger Robot
5ccfef6e6b Merge "Export Wifi Parcelables AIDLs from framework.jar" 2020-02-03 02:05:12 +00:00
Jiyong Park
963ee178c9 Don't build framework-annotation-proc with framework.jar
Previously, framework-annotation-proc was built with framework.jar in
its classpath.  This was because sdk_version is not set for the module,
in which case the build system automatically add framework.jar to the
classpath.

This is wrong because the classes from framework.jar are also provided
via the srcs property of framework-annotation-proc. With this setup, a
build error could happen when there is a jarjar'ed class. The class is
jarjar'ed in framework.jar, while the same class in source files isn't
jarjar'ed yet when compiling it.

To fix the problem, remove framework.jar out of classpath by setting
sdk_version to core_platform and provide additional libraries via libs
property.

Bug: N/A
Test: m
Change-Id: I00974c76aaa0ce40384ffa6bf13d4f0ba5e37954
2020-02-01 18:07:57 +09:00
Muhammad Qureshi
1de1df4c60 Add FrameworkStatsLog
Add a genrule for FrameworkStatsLog and it to frameworks.jar

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated FrameworkStatsLog.

Follow up CLs will replace usages of StatsLog.write calls with
FrameworkStatsLog.write.

Bug: 145952197
Test: m
Merged-In: I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632
Change-Id: I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632
(cherry-pick from internal branch with minor conflicts)
2020-01-31 19:35:00 +00:00
Automerger Merge Worker
2594ced93c Merge "Do not block for connector in TetheringManager" am: 6674b930fd am: bd9b1908fb am: e094cf9519
Change-Id: If1187beb53716d2c8f9855634a9b913ffceee604
2020-01-31 16:27:56 +00:00
Xiao Ma
859af50899 Export Wifi Parcelables AIDLs from framework.jar
Add Wifi public/@SystemApi Parcelable AIDLs to
framework.jar AIDL exports so that they can be
referenced outside the Wifi module.

Create a new folder "aidl-export" to separate
the AIDLs we want to export to allow external
callers to reference in their AIDL. Private AIDLs
remain in the "java" folder.

most of modifications cherry-pick from internal master
(ag/10139892), but slight change for Android.bp to be
able to compile in aosp build system. keeping the same
aidl path as master to find the correct path when importing
ScanResult from wifi.

Bug: 140299412
Bug: 137835398
Test: atest FrameworksWifiTests

Merged-In: I4e0dc1119bf2b49865c9b5cdf23c571528228902
Change-Id: Idaae4f365e4efaead023ee175391a9e9432a6e00
2020-01-31 13:01:30 +09:00
Muhammad Qureshi
cb2c0230a1 Merge changes Icce2f6ed,Ic1788f65,I59e327d4
* changes:
  Add flag to stats-log-api-gen for WorkSource.
  Make writeKeyValuePairs accept Nullable args
  Use preview_sdk_int for version code checks
2020-01-29 23:46:20 +00:00
Remi NGUYEN VAN
6674b930fd Merge "Do not block for connector in TetheringManager" 2020-01-29 23:46:00 +00:00
satayev
c5dd215f8a Merge "Remove unused UnsupportedAppUsage annotations." 2020-01-29 21:34:59 +00:00
Artur Satayev
33ce802378 Remove unused UnsupportedAppUsage annotations.
The new annotation is android.compat.annotation.UnsupportedAppUsage.

Test: m
Bug: 145132366
Exempt-From-Owner-Approval: approved in internal
Change-Id: Ie12e28eee0ed20b5677ee3162143700813b7ab64
Merged-In: Ie12e28eee0ed20b5677ee3162143700813b7ab64
2020-01-29 21:34:04 +00:00
Artur Satayev
192ca30b7a Remove unused UnsupportedAppUsage annotations.
The new annotation is android.compat.annotation.UnsupportedAppUsage.

Test: m
Bug: 145132366
Exempt-From-Owner-Approval: previously approved change
Change-Id: Ie12e28eee0ed20b5677ee3162143700813b7ab64
2020-01-29 18:19:45 +00:00
Remi NGUYEN VAN
24b7b6a047 Do not block for connector in TetheringManager
Instead of blocking for the ITetheringConnector, in the rare case (only
on boot) that the connector is not ready, queue requests and poll for
the connector until it is available.

Bug: 146821053
Test: Flashed, verified tethering working
Change-Id: I4bd45fcbdce2336694c3b6a349f121e40230f001
2020-01-29 15:15:58 +09:00
Yurii Zubrytskyi
577c74b861 Merge "Port the current code to new IncFS" 2020-01-29 01:37:01 +00:00
Yurii Zubrytskyi
4a25dfb2de Port the current code to new IncFS
Bug: 146080380
Test: manual, "cmd incremental install-start"

Change-Id: I6761c3f0e58b6d4de1ae3c4b31c23204fba9f740
2020-01-28 12:10:17 -08:00
TreeHugger Robot
97f1344c47 Merge "Add FrameworkStatsLog" 2020-01-28 18:42:48 +00:00
TreeHugger Robot
5d76edcd91 Merge "Rename exoplayer2-core to exoplayer2-extractor" 2020-01-28 12:57:05 +00:00
Automerger Merge Worker
54c3e587bf Merge "Specify which packages metalava should skip in API linting." am: d4454de42f am: 245d0bff54 am: 14fbe2c786
Change-Id: Ie01300ffb67aa8aa6262b7955db4a6e607117757
2020-01-28 00:42:01 +00:00
Muhammad Qureshi
04ec2529f7 Add FrameworkStatsLog
Add a genrule for FrameworkStatsLog and it to frameworks.jar

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated FrameworkStatsLog.

Follow up CLs will replace usages of StatsLog.write calls with
FrameworkStatsLog.write.

Bug: 145952197
Test: m
Change-Id: I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632
2020-01-27 16:36:45 -08:00
Aurimas Liutikas
d4454de42f Merge "Specify which packages metalava should skip in API linting." 2020-01-28 00:09:27 +00:00