Commit Graph

69 Commits

Author SHA1 Message Date
Anton Hansson
9b3300177c Update references to ike stubs
Bug: 147768409
Test: m
Change-Id: Idf801c304458908f0a8ef36bfa5a7a7546e6bf48
Merged-In: Idf801c304458908f0a8ef36bfa5a7a7546e6bf48
2020-03-17 09:24:45 +00:00
Anton Hansson
cec9266610 Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
Merged-In: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-16 15:54:19 +00:00
Peter Collingbourne
b1597060fc Merge "Add compat annotation processor for services/core." 2020-02-25 22:27:49 +00:00
Peter Collingbourne
7cb1eae174 Add compat annotation processor for services/core.
We have compat annotations in services/core (specifically
NATIVE_HEAP_POINTER_TAGGING and CTS_SYSTEM_API_CHANGEID, and soon
NATIVE_MEMORY_TAGGING) so we need to add the processor.

Bug: 135754954
Bug: 135772972
Change-Id: I134c67907abdba1dee971111498c6e50da68a768
Merged-In: I25c6339c6adeb907878596332f57e2fa229bfda9
2020-02-25 10:41:01 -08:00
evitayan
5fc0bbaae7 Do not statically link ike-stubs
Stub jars should not be in statically linked except for inside
other stub jars.

Bug: 145995723
Test: build, flash and reboot
Test: FrameworksIkeTests, FrameworksNetTests
Change-Id: I503616de0143cc39dd189ae689de3e8d77c345da
2020-02-21 13:11:09 -08:00
evitayan
78ed90270a 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
Merged-In: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
2020-02-21 06:22:12 +00:00
Mark Chien
3e4ab5c2b5 Merge "Use framework-tethering-stub instead of framework-tethering" 2020-02-19 09:46:24 +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
Stephane Lee
90bf87449f Consume health HAL 2.1 values from framework
Bug: 148816661
Test: Ensure that there are no issues with the time to full when
charging
Change-Id: Ie21d451432cd65a91303a8faf40df64935f5c4bb
2020-02-15 16:51:02 -08:00
Ivailo Karamanolev
4c5ac6b353 Add Lights AIDL HAL support to LightsService
Add conditional code to LightsService to call the new Lights AIDL HAL
where available and fall back to the 2.0 HIDL HAL if not.

Bug: 142230898
Test: manual; send a notification with lights; display backlight set ok
Test: see followup commit for atest instructions.
Change-Id: I6ca278bf789ae1e7473ce132a895099ad236b26a
Merged-In: Ic9b4fbc5570ea49cff903df27c9714bed23bf98c
2020-02-07 02:07:10 +01:00
Steven Moreland
623e66caa7 vibrator: use package as name
In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-vibrator format to the package format
(android.hardware.vibrator).

Bug: N/A
Test: all build time
Change-Id: I3805fea0be71c6cec9354d0ca71b4678387e516c
Merged-In: I3805fea0be71c6cec9354d0ca71b4678387e516c
2020-01-06 15:33:50 -08: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
e86e89acff Add filegroups for services.* libraries
... in preparation for creating a stub library from services.jar

Bug: 139391334
Test: m

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

Merged-In: Ifd6cfc77acf2284804a2f64011c2733b5c222369
(cherry picked from commit bae2e90796)
Change-Id: Ifd6cfc77acf2284804a2f64011c2733b5c222369
2019-12-11 15:55:33 +09:00
markchien
0df2ebc43d [Tether07] Migrate Tethering into module
Now tethering would be run in dedicated service.
TetheringManager is the interface used to communicate with
TetheringService. The new call flow would be: ConnectivityManager
-> ConnectivityService -> TetheringManager -> TetheringService.
Note: the return value of #tether(), #untether() and #setUsbTethering()
APIs would always be no error. Client can use #getLastTetherError()
or #getTetheredIfaces or listen tether state change to check
status of corresponding interface.

Bug: 136040414
Bug: 144742179
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
Merged-In: I7e78c0e0a3e70f940a749ba2a39ece7c7ec5b9b3
2019-11-30 10:03:08 +00:00
markchien
d8676d99ff [Tether07] Clean up build rule for libtetheroffloadjni
- Statically include android.hardware.tetheroffload.config@1.0,
  libcutils and their dependency library.
- Use shared-lib if there is NDK or NDK-compliant version
- Remove android.hardware.tetheroffload.control-V1.0-java from
  service.core because it is already statically built in tethering apk

Bug: 143195885
Test: -build, flash, boot
Change-Id: Ic082045bc04d3989f7f095c7a499bc0d943e4031
Merged-In: Ic082045bc04d3989f7f095c7a499bc0d943e4031
2019-11-30 09:57:36 +00:00
Steven Moreland
5af46952b2 Remove vibrator@1.4
Since this HAL was converted to AIDL.

Bug: 141828236
Test: boot, use vibrator
Change-Id: I0835dcecf7e6a3a4b5b01675df2a36ca8e6cd7a7
2019-11-18 20:10:34 -08:00
atrost
1a9455046c Move android.compat.annotation package out of libcore
Test: m + flash
Bug: 142650523
Change-Id: I1321195c8724485a90b162b32c3c8549dbd11c42
2019-11-11 15:10:57 +00:00
Treehugger Robot
80c3a5db12 Merge "Fix netd_aidl_interface compatible problem" 2019-11-01 02:23:31 +00:00
Harpreet "Eli" Sangha
89ffc2d327 Vibrator Service: Support Async Callback APIs
Bug: 136220871
Test: TBD
Change-Id: Ia639dd01081218db0bc3029316a58a03b9d4d927
(cherry picked from commit 7a4f1d23ea)
Merged-In: Ia639dd01081218db0bc3029316a58a03b9d4d927
2019-10-31 09:51:09 -07:00
markchien
11467288c6 Fix netd_aidl_interface compatible problem
Both of services.net and services.core statically link
netd_aidl_interface. But they use different version.
Since services.core already include service.net, removing
netd_aidl_interface from service.core.

Bug: 143560726
Bug: 139280289
Test: -build, flash, boot
      -Off/On tethering

Change-Id: Ifa83880ee7ee88ed67f8b638228ef1b0887e201e
2019-10-31 20:50:11 +08:00
markchien
f303c5a881 [Tether04] Migrate EntitlementManager into module
Bug: 136040414
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: Ifdfc6cd95377351c37946a146b60896f07ece59d
Merged-In: Ifdfc6cd95377351c37946a146b60896f07ece59d
2019-10-30 11:06:28 +00:00
markchien
08cc03051a [Tether03] Migrate IpServer into module
Add IpServer which is used to serve ip configuration, dhcp, dns proxy
and nat for downstream interface.

Bug: 136040414
Test: -build, flash, boot
      -atest TetheringTests
      -atest FrameworksNetTests

Change-Id: I23652ae0b9509abe7d38da96d523eb22ab00a343
2019-10-24 14:20:52 +08:00
markchien
a6ba54d59d [Tether02] Migrate TetheringConfiguration into module
TetheringConfiguration is a utility class to encapsulate the various
configuration elements.

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

Change-Id: I9434ab213bc5e0fca59f14a6c8cea554abefc3a4
2019-10-24 14:00:05 +08:00
Luke Huang
a3ddee80fd Merge "Support enable/disable dns forwarding of dnsmasq when start tethering"
am: 6fecb94292

Change-Id: I8f5c67fa1e045c9fd4a5e7a753df285d1111c1d2
2019-08-28 06:06:44 -07:00
Luke Huang
b0d52464f1 Support enable/disable dns forwarding of dnsmasq when start tethering
Bug: 128782815
Test: built, flashed, booted
Change-Id: Ic6ee985b42cbe77e8f2208fba62108604fc7bbcf
2019-08-20 20:42:13 +08:00
atrost
fee45aa4dc Move IPlatformCompat.aidl definition to framework.jar
There are non-app process usecases in framework code that need to have
access to this API.
Created a new package android.compat in frameworks/base/core following
previous definition of android.compat.Compatibility for app processes
(http://cs/android/libcore/luni/src/main/java/android/compat/Compatibility.java).

Bug: 137769727
Test: m
Change-Id: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
Merged-In: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
2019-08-14 16:47:18 +01:00
atrost
b18da3cad9 Move IPlatformCompat.aidl definition to framework.jar
There are non-app process usecases in framework code that need to have
access to this API.
Created a new package android.compat in frameworks/base/core following
previous definition of android.compat.Compatibility for app processes
(http://cs/android/libcore/luni/src/main/java/android/compat/Compatibility.java).

Bug: 137769727
Test: m
Change-Id: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
Merged-In: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
2019-08-14 16:35:14 +01:00
atrost
4f8c307dbf resolve merge conflicts of 56509ddb84 to stage-aosp-master
Bug: 138222871
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3965d41d6756a25dd44a0ed676de5ec8b5bae21
Merged-In: Id523d31e7b6d2def9371753ae34cba883cd62a54
2019-07-29 15:21:58 +01:00
atrost
7e6060f448 Read compat config in CompatConfig class.
Use the auto generated parser, and test by feeding streams of XML.

Test: atest FrameworksServicesTests
Bug: 138222871
Change-Id: Id523d31e7b6d2def9371753ae34cba883cd62a54
Merged-In: Id523d31e7b6d2def9371753ae34cba883cd62a54
2019-07-26 15:43:09 +00:00
Andrei Onea
4fd8dabd52 resolve merge conflicts of 130e0ade7b to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie8cfba397930a1bd5ec947f4834478bb629fa640
Merged-In: I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4
2019-07-25 18:17:30 +00:00
Andrei Onea
6cd9d4d18e Make PlatformCompat a Binder class
This allows PlatformCompat to be called from anywhere in the platform.
In follow-up CLs, we'll define permissions for each method and/or
filtering rules to prevent abuse from apps.

Test: m
Bug: 137769727
Change-Id: I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4
Merged-In: I19e5fbfefcf59e0b53b197ea8e9e3cb78439b4c4
2019-07-25 12:38:04 +00:00
Lorenzo Colitti
433f7c4178 Merge "Properly use versioned interfaces." am: 9572afce76
am: b92fbe0435

Change-Id: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
2019-05-22 01:20:45 -07:00
Lorenzo Colitti
fe0c38aed5 Properly use versioned interfaces.
Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \;

Bug: 133124190
Test: m
Change-Id: Id175c99daa77507847673777a8dcce51897ab17b
2019-05-22 03:12:59 +00:00
Luke Huang
6764eff395 Merge "Use IDnsResolver instead of INetd for resolver related binder commands" am: b9ef4dd299 am: 1711278ce2
am: ceb74821a3

Change-Id: I2d642b71df25934fddd8a1476b5d27457628b8e2
2019-03-29 02:24:24 -07:00
Luke Huang
b9ef4dd299 Merge "Use IDnsResolver instead of INetd for resolver related binder commands" 2019-03-29 08:45:19 +00:00
Luke Huang
6591477a5b Use IDnsResolver instead of INetd for resolver related binder commands
migrate resolver related commands from INetd to IDnsResolver

Bug: 126141549
Test: atest FrameworksNetTests ConnectivityServiceTest Nat464XlatTest
      atest DnsManagerTest
Change-Id: I559c0c1304d53dde408c062e1a52e742595e7cbe
2019-03-27 17:39:07 +08:00
Siarhei Vishniakou
4dfa47054e Move tag definitions into policy
Currently, the tags are defined in system/core.
Instead, reserve a range in system/core and define the tags in policy.

Next, we add a flag for interceptKeyBeforeQueueing.

Bug: 128933363
Test: adb logcat -b events, turn on screen, then press power button and
observe the logs.

Change-Id: I1fde2a2e7451ec67987ad3b09abc28be64410427
2019-03-26 12:56:08 -07:00
Siarhei Vishniakou
6f87741272 Move tag definitions into policy
Currently, the tags are defined in system/core.
Instead, reserve a range in system/core and define the tags in policy.

Next, we add a flag for interceptKeyBeforeQueueing.

Bug: 128933363
Test: adb logcat -b events, turn on screen, then press power button and
observe the logs.

Change-Id: I1fde2a2e7451ec67987ad3b09abc28be64410427
Merged-In: I1fde2a2e7451ec67987ad3b09abc28be64410427
2019-03-26 12:46:58 -07:00
Marco Nelissen
ec7ed1c990 Remove support for updatable media components in apk
Bug: 123250010
Test: boot, play video
Change-Id: I95f8d28cdb4ce0bef04711ba0e9322fe8bfd79d9
2019-02-04 16:02:35 +00:00
Peter Kalauskas
9590e009e9 Merge "Update android.hidl.manager-V1.0-java to V1.2" am: b9e216c2b6 am: e20b0fb677
am: d9c2837cad

Change-Id: Icf8910e23129481daa2ad9f5b42f0828ebe5b6d3
2019-01-31 14:39:43 -08:00
Peter Kalauskas
b9e216c2b6 Merge "Update android.hidl.manager-V1.0-java to V1.2" 2019-01-31 22:05:47 +00:00
Peter Kalauskas
65589e9563 Update android.hidl.manager-V1.0-java to V1.2
Test: Manual
Bug: 123307146
Change-Id: I8dcd291c187af2cb20fd9a8f09bd55e75a2762e1
2019-01-31 21:40:12 +00:00
Howard Chen
f17f42b0df Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Merged-In: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
2019-01-31 15:10:21 +08:00
Howard Chen
0a94764738 Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
2019-01-31 14:19:34 +08:00
Lorenzo Colitti
9dfc3c1b45 Merge changes from topic "netd-event-listener-aidl" am: 481251a0c2 am: 379029671a
am: 94cffb3a6c

Change-Id: I2b30cac46eb96e3a0425088f516176ce5ac4fd28
2018-12-11 23:13:42 -08:00
Lorenzo Colitti
31324cb4b2 Depend on the stable AIDL version of the netd metrics interface.
We used to include the AIDL file directly, but that does not
provide useful features such as getVersion() support and is
generally not the preferred approach.

Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Change-Id: I7ca56e4b440dc2321f5a7b77bac630a48e69100a
2018-12-12 01:03:55 +09:00
Luke Huang
e405415a62 Merge "Migrate INetd to stable aidl" am: 9677dde14a am: ef6b675a8c
am: c2126e2008

Change-Id: I9866b431cd5ddeb318e164fc2a897537a3a7a88d
2018-12-10 03:00:58 -08:00
Luke Huang
734c4cea3c Migrate INetd to stable aidl
Del the linking of old lib file and add new one.

Test: runtest frameworks-net passes
Change-Id: I7258f7c51718ff5f07e7bfe301b6c5f242b9da5a
2018-12-07 10:40:45 +00:00
Luke Huang
2ef88d1875 Move netd related file group to the end for avoiding conflict
This patch should change no functionality.

Test: builded pass
Change-Id: I8161a9a365c6bfcd92f4b7a8fd641ad3a483d09c
Merged-In: If3e387ae9fcc22da7a4feca30c20391e5b236728
2018-12-07 05:33:18 +00:00
Luke Huang
11937a9238 Move netd related file group to the end for avoiding conflict
This patch should change no functionality.

Test: builded pass
Change-Id: If3e387ae9fcc22da7a4feca30c20391e5b236728
2018-12-07 11:51:40 +08:00