Commit Graph

1488 Commits

Author SHA1 Message Date
Yan Yan
652362a259 Merge "Add ike-internals when building framework-all-sources" into rvc-dev am: d43e376c3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11992867

Change-Id: Ic785a70b522555b35de885cb8ca0fcdc9676fb41
2020-06-29 21:02:39 +00:00
evitayan
73e07acf09 Add ike-internals when building framework-all-sources
The framework-all-sources filegroup includes sources from ike-srcs
which in turn depends on bouncycastle sources. This change

Bug: 152328618
Bug: 159008684
Test: m droid
Change-Id: Ife5d1b2c80469ee5196d61806b721cf9dae251ed
Merged-In: Ife5d1b2c80469ee5196d61806b721cf9dae251ed
2020-06-26 18:28:49 +00:00
Remi NGUYEN VAN
091cee7eda Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: 6555756e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia5028f7dfeadbcf928efb9862b481c82e2849e18
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
6555756e90 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev 2020-06-19 00:49:29 +00:00
Amy Zhang
d01cca87de Merge "Update media resourceManagerService with the Application pid" into rvc-dev am: cea1d98cde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11803042

Change-Id: Ied90455799e40db892764d50ac69286223bc914d
2020-06-15 21:12:53 +00:00
Amy Zhang
ccdbc4ddd8 Update media resourceManagerService with the Application pid
This CL updates the media resourceManagerService calling pid with the
real application pid when TunerResourceManager is able to get this
information from TvInputManager. Calling
IResourceManagerService.overridePid to update.

Test: dumpsys media.resource_manager on cuttlefish
Bug: 150989423
Change-Id: Ie811ae15bbcc326ed3a09f97b6b5a57f4b48b094
2020-06-15 17:40:34 +00:00
Remi NGUYEN VAN
eee629f4c7 Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-06-12 17:04:06 +09:00
Paul Duffin
a0460cb747 Merge "Switch to standard naming scheme" into rvc-dev am: f94d682a9b
Original change: undetermined

Change-Id: Ia56347e16ba637bbd4e23cfa664a7b78fe4aa52f
2020-06-02 11:58:45 +00:00
Paul Duffin
abebc6a897 Switch to standard naming scheme
Removes use of the special framework-modules naming scheme.

Bug: 155164730
Test: m java
Exempt-From-Owner-Approval: Build cleanup.
Change-Id: I3b78fcbcacc3df787e171d6eedeef1e51b087615
Merged-In: I0c31e2183353dfb5bd49f04f3455cb7b10be6866
(cherry picked from 8b864fb45c)
2020-06-02 06:53:53 +00:00
Baligh Uddin
12e3b85dd0 Merge commit '864a2b0e25da01885f558bde41e9da73801c790e' into manual_merge_864a2b0e25da01885f558bde41e9da73801c790e
Change-Id: I39f86a02a4d7ccdc3674be61ad96ec9b05fed617
Merged-In: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2
Test: TH
Bug: 156287389
2020-05-28 21:11:45 +00:00
Baligh Uddin
f1613ef178 Adjust visibility rules for IPSec
BUG: 156287389
Test: TH and Local Build
Merged-In: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2
Change-Id: I097ce1a51d2fa1abde3502f6023f4d840cee3794
2020-05-27 23:39:04 +00:00
Alex Buynytskyy
1ad652187c Merge "Lifecycle: detecting blocked and unhealthy." into rvc-dev am: 4e5ff2eb7d
Change-Id: I3b68f9b64c91e85132dfec3f5c740d28e469697a
2020-05-27 04:17:05 +00:00
Alex Buynytskyy
8ef61aebee Lifecycle: detecting blocked and unhealthy.
Part 1: interfaces and PM implementation.

Bug: 153874006
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: I312dd919d2bb552bea3d72fb49fd1579882da14b
2020-05-26 19:34:39 +00:00
Hall Liu
2ec58b1158 Refactor SubscriptionManager caching code am: 29b1874ffc
Change-Id: I8168420f37eb8324580c8ec648d091f0b5a5bb7f
2020-05-05 16:45:50 +00:00
Hall Liu
29b1874ffc Refactor SubscriptionManager caching code
Create a genericized class to use for SubscriptionManager caching calls
in order to avoid duplicating logic that fetches values from ISub.

Bug: 151953109
Test: atest android.telephony.cts.SubscriptionManagerTest

Merged-In: I6682ded8aec8cb3e50521584c177df6d5dae8c49
Change-Id: I6682ded8aec8cb3e50521584c177df6d5dae8c49
2020-04-28 16:22:48 -07:00
Mark Chien
0240cac300 Merge "Remove Preconditions usage to stop dependecy with non-updatble class" into rvc-dev am: d974b33386
Change-Id: I7b13aa7a500d804d0e8ef96d9d72556f3c642124
2020-04-28 03:12:09 +00:00
Mark Chien
26631c7d8c Remove Preconditions usage to stop dependecy with non-updatble class
Stop depending on Preconditions that is not released on the same cadence
as the module, and is maintained as part of the framework.

Bug: 148636687
Test: atest TetheringTests NetworkStackNextTests

Merged-In: Id0dcec44f362f79bc8c046d722635687a7388aa2
Change-Id: Id0dcec44f362f79bc8c046d722635687a7388aa2
2020-04-27 12:38:07 +00:00
David Su
44d450a87e Merge "framework-wifi: remove duplicate classes" into rvc-dev am: 87ce901869
Change-Id: I29a472aa2d48f7bf1151487c2fa089bb9a2102db
2020-04-22 18:44:53 +00:00
David Su
57bca318f1 framework-wifi: remove duplicate classes
Preconditions & Inet4AddressUtils are statically
linked into both framework-wifi and service-wifi.
This creates duplicate classes, which should be
avoided. Instead, service-wifi should simply refer
to the copy of Preconditions/Inet4AddressUtils in
framework-wifi.

Bug: 153596226
Test: device boots up and connects to wifi
Change-Id: Ie78e5cf0f6ff7bc8a2fa8d7264b742f912601143
2020-04-22 05:40:28 +00:00
Jiyong Park
1722509345 Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: 28665792a2
Change-Id: I1693261f829fe4b40dbe2d0e11b7e88916582476
2020-04-21 10:11:46 +00:00
Amit Mahajan
7d9f1e3ea5 DO NOT MERGE Remove references of telephony-stubs.
Since it's not used for now.

Test: TH
Bug: 153304048
Merged-in: I1812818c3d49463c3840a98212bbab58a110359a
Change-Id: I1812818c3d49463c3840a98212bbab58a110359a
2020-04-20 16:48:33 +00:00
Jiyong Park
28665792a2 Merge "Mark some aidl_interface modules as unstable" into rvc-dev 2020-04-20 03:23:06 +00:00
Amit Mahajan
7973105d8b DO NOT MERGE Remove references of telephony-stubs.
Since it's not used for now.

Test: TH
Bug: 153304048
Merged-in: I1812818c3d49463c3840a98212bbab58a110359a
Change-Id: I1812818c3d49463c3840a98212bbab58a110359a
2020-04-15 17:55:52 -07:00
Jiyong Park
db589dded4 Mark some aidl_interface modules as unstable
With b/152655547, all aidl_interface modules are considered as stable
unless it is explicitly with "unstable: true". This change marks the
aidl_interface that are not used across updatable module bounraries
as unstable, so that the build system does not run the API
dumping/checking on them.

Bug: 152655547
Test: m
Change-Id: I1257c66de6dd42b2d32d47ed74cb2878f79d14fb
2020-04-13 13:00:47 +09:00
Sungsoo Lim
d2f9db50f6 Merge "Do not export private AIDL files of the media module" into rvc-dev am: 383371cdc5
Change-Id: Iff271892d0cabb03d7eaccd05bfcbab758598e4f
2020-04-10 06:32:26 +00:00
Sungsoo Lim
383371cdc5 Merge "Do not export private AIDL files of the media module" into rvc-dev 2020-04-10 05:28:21 +00:00
Sungsoo Lim
895f4f6914 Do not export private AIDL files of the media module
The current directory contains public and private AIDL types in the same place.
This CL separates into two directories and makes the directory having the
public types should be exported.

Bug: 148660295
Test: build
Change-Id: Ib2632afa00f7fa7f992690e68684464928cd3c61
2020-04-08 15:05:26 +09:00
TreeHugger Robot
14e544cd4d Merge "Change the way how we call setStorageParams." into rvc-dev am: 9f16f2665a
Change-Id: Ie6a8b11fada01fe590fc52362e1e822e7a4807d8
2020-04-08 00:52:06 +00:00
Alex Buynytskyy
f415679228 Change the way how we call setStorageParams.
Now it's unified with callback FS connector - we are passing the
callback pointer directly to dataloader. This restricts access only
to methods we want and only by someone we want.

Bug: b/153468113
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: Ib557ebbe7c6c5ce92140eb20534a3626b3ac96d3
2020-04-07 14:42:50 -07:00
Anton Hansson
c5c3734017 Merge "Don't link wifi utils against android_system_stubs" into rvc-dev am: d972846baa
Change-Id: Iaabffd9966a394b6cf8a2bef06b38253ab80f191
2020-04-01 11:45:35 +00:00
Anton Hansson
d972846baa Merge "Don't link wifi utils against android_system_stubs" into rvc-dev 2020-04-01 11:29:12 +00:00
Anton Hansson
f1e82fe6fc Merge "Don't link telephony stubs against android_system_stubs" into rvc-dev am: c333c8e049
Change-Id: Ib58f29ee7e1fa575cf2c48d3a0c2522aa466b4bd
2020-04-01 11:20:04 +00:00
Anton Hansson
c33a1b6615 Don't link telephony stubs against android_system_stubs
Compile against an SDK instead, which will enforce link
checks.

Bug: 152864915
Test: m
Change-Id: I49cbc4f6c6c5a1b9260b385f3c97ac2387bb9c47
2020-03-31 18:34:01 +01:00
Anton Hansson
5a088e03e1 Don't link wifi utils against android_system_stubs
Compile against an SDK instead, which will enforce link
checks.

Bug: 152864915
Test: m
Change-Id: Id080d7c6579fa0c9f3a97a3110f119e99053e3c6
2020-03-31 18:09:01 +01:00
Artur Satayev
f9d1f9afc2 Merge "Export change id processor." into rvc-dev am: d6503d5cfd
Change-Id: I3f0ba43c6ad7b01b03452f513ebdbb71eeb7c389
2020-03-29 18:22:35 +00:00
Artur Satayev
d6503d5cfd Merge "Export change id processor." into rvc-dev 2020-03-29 18:07:37 +00:00
Artur Satayev
f9172bd785 Export change id processor.
- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
Merged-In: Ie750b5391229d21679a8610780b9f8d4a997e204
(cherry picked from commit 9f5a5623a7)
2020-03-28 19:24:53 +00:00
Anton Hansson
966c51c5ab Merge "Limit framework module api packages" into rvc-dev am: 26c1b004da
Change-Id: Ia26fa1f7271f6422f67b5ccdd84f46d1bd9340c6
2020-03-28 17:13:19 +00:00
Anton Hansson
f79b08b7ab Limit framework module api packages
Use the same whitelist of packages that the non-updatable
part of the platform uses for now. This avoids exposing some
internal classes in a follow-up CL.

Move telephony off the module-wide defaults for now, as the
telephony stubs are causing problems.

Bug: 149293194
Test: m checkapi
Change-Id: Iedc8c309cef8290ac14e1ad32b5b66656145f557
2020-03-27 20:56:59 +00:00
Artur Satayev
7ec4974bf9 Merge "Remove unsupportedappusage-annotation library." into rvc-dev am: ac4b9bf790
Change-Id: I3e6eedb6dec3d82f17ad2a7b2539f7feb9228c3e
2020-03-27 11:45:22 +00:00
Artur Satayev
ac4b9bf790 Merge "Remove unsupportedappusage-annotation library." into rvc-dev 2020-03-27 11:30:12 +00:00
Yurii Zubrytskyi
4604a9bbe7 Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623
Change-Id: Ia1586861dc98bdbf73570b6230960643c1951877
2020-03-27 07:47:35 +00:00
Yurii Zubrytskyi
a7b10f5623 Merge "Dynamic args complete removal." into rvc-dev 2020-03-27 07:23:55 +00:00
Alex Buynytskyy
686a537376 Dynamic args complete removal.
Bug: b/150470163
Test: atest PackageManagerShellCommandIncrementalTest PackageManagerShellCommandTest
Change-Id: I122f37f210ef9b8b02d565c34245ebeec26d83b2
2020-03-26 16:28:33 -07:00
Yan Yan
bb61bc93b5 Merge "Include HexDump in framework-ike-shared-srcs" into rvc-dev am: 6d7751e766
Change-Id: I8dbe3324d329392087f3528f45a077eb354bf126
2020-03-26 22:46:22 +00:00
Artur Satayev
8612937cb6 Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Merged-In: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
2020-03-26 14:40:16 +00:00
Automerger Merge Worker
0ad9c8169b Include HexDump in framework-ike-shared-srcs
Bug: 148689509
Test: FrameworksIkeTests, FrameworksNetTests
Change-Id: I6a28a173a6ab0d89c0e80d9e335a15e5e685fa27
Merged-In: I6a28a173a6ab0d89c0e80d9e335a15e5e685fa27
(cherry picked from commit 5b6bb448f2)
2020-03-24 23:06:26 +00:00
Artur Satayev
6e44b5395d Merge "Remove unsupportedappusage_index.csv from droidcore target." into rvc-dev am: ee6e043a0f
Change-Id: I5a8727777bbdfd73e9f9c5cd0452095d2ddb3cf4
2020-03-24 22:55:17 +00:00
Artur Satayev
9a104a759e Remove unsupportedappusage_index.csv from droidcore target.
out/soong/hiddenapi/hiddenapi-index.csv produced by a singleton rule replaced the target.

Test: m
Bug: 145132366
Change-Id: I29267c179f301ebcb128d615229858ced549d670
Merged-In: I29267c179f301ebcb128d615229858ced549d670
(cherry picked from commit e1b9738578)
2020-03-24 17:47:49 +00:00
Xiangyu/Malcolm Chen
abdeaee816 Merge "Remove framework-telephony as it's not used in R." into rvc-dev 2020-03-23 18:47:56 +00:00