Commit Graph

661469 Commits

Author SHA1 Message Date
Thiébaud Weksteen
ada390bead Merge "Transition SerialManager to @EnforcePermission" am: dd9db63692
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946227

Change-Id: Ifaafd3f07f3318c1bce6c21b04c8ac5392ebc1e1
2022-01-19 00:46:11 +00:00
Treehugger Robot
070f2b0502 Merge "Migrating frameworks/base BT files" 2022-01-19 00:31:25 +00:00
Thiébaud Weksteen
dd9db63692 Merge "Transition SerialManager to @EnforcePermission" 2022-01-19 00:28:57 +00:00
John Wu
be201a0ed5 Merge "Update AndroidKeyStoreMaintenance framework API" am: 8c34efd29a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950401

Change-Id: I1b23442c2a7e5bce0659be286202ce571c4566b3
2022-01-19 00:23:52 +00:00
John Wu
8c34efd29a Merge "Update AndroidKeyStoreMaintenance framework API" 2022-01-19 00:05:29 +00:00
Colin Cross
5d23271049 Merge "Fix incorrect licenses in frameworks/base" am: a9e0018834
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945448

Change-Id: I5319328bdc6fcf0ffa207bd592a59d1e4e4895c1
2022-01-18 23:41:11 +00:00
Treehugger Robot
a1a2c48887 Merge "Modify KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY's description" am: e02ea9b779
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944708

Change-Id: Id52c98803f9017c63358884001ef6819c4c8a46b
2022-01-18 23:40:56 +00:00
Colin Cross
a9e0018834 Merge "Fix incorrect licenses in frameworks/base" 2022-01-18 23:31:25 +00:00
Treehugger Robot
e02ea9b779 Merge "Modify KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY's description" 2022-01-18 23:21:56 +00:00
Gareth Vaughan
8051cf324f Merge "Add new permission START_CROSS_PROFILE_ACTIVITIES" am: 0702622783
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1949116

Change-Id: I2060c34e54f975c1257895b1089f76055d510915
2022-01-18 19:15:30 +00:00
Gareth Vaughan
0702622783 Merge "Add new permission START_CROSS_PROFILE_ACTIVITIES" 2022-01-18 18:54:46 +00:00
Treehugger Robot
3a0e798ed9 Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689

Change-Id: I55c1cd02960b6fae7dbea7c714b94b992f9d367b
2022-01-18 18:10:58 +00:00
Treehugger Robot
e0029a5a87 Merge "Setting ASM to version 7 in sdkparcelables" 2022-01-18 17:53:22 +00:00
Treehugger Robot
ea1c39cede Merge "Fix default value type : should be long instead of int .." am: 061654bdc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952576

Change-Id: Ibc7cc1f01432452a18588f64409dbc0570b932a8
2022-01-18 17:12:08 +00:00
Treehugger Robot
061654bdc3 Merge "Fix default value type : should be long instead of int .." 2022-01-18 16:54:45 +00:00
Treehugger Robot
865e1525c1 Merge "Service: transmits empty station list" am: 79b1a4da7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942313

Change-Id: I984265cf6ac83d8038dabfe4ac63310781e69fd1
2022-01-18 15:01:22 +00:00
Treehugger Robot
79b1a4da7a Merge "Service: transmits empty station list" 2022-01-18 14:57:51 +00:00
Anton Hansson
c0d04de42d Merge "Fix test source reference" am: 09dcc2da3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952376

Change-Id: I1c1fb79b8ad77ae7377aa1eca479e336cb4f0a72
2022-01-18 14:46:23 +00:00
Anton Hansson
58d04c0fec Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ... am: 7e226700a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952383

Change-Id: I1e99aa8b4ff80caaa906e7f60fab7d83da2c020b
2022-01-18 14:45:49 +00:00
Anton Hansson
611021d067 Minor refactorings in api.go am: fd31645f85
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952382

Change-Id: I5e735f2cb24a0af551bb69d211d483bc7f0ce8f5
2022-01-18 14:45:47 +00:00
Anton Hansson
fc83a8623c Convert merged module lib stub to api.go am: cb00f94596
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952381

Change-Id: Ib8d09533b7b1b2b1482b1f3c545e1aed4dfd25f5
2022-01-18 14:45:46 +00:00
Anton Hansson
aa5dfcca06 Some minor tweaks for api.go am: 05e944d8df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952380

Change-Id: If8dabb57f48861fb46235f6e299b9f889ce552f8
2022-01-18 14:45:43 +00:00
Anton Hansson
a5b659334f Temporarily add support for conditional modules am: 07a1295cfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952379

Change-Id: I90eb72df0f163c9b31207250f8d47835da1c6bc8
2022-01-18 14:45:42 +00:00
Anton Hansson
5a424a80c7 Construct sdk-annotations.zip programmatically am: cc18e03e44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952378

Change-Id: I5994601a51bd1ec68e0f11cc62fbd2455acd3c22
2022-01-18 14:45:40 +00:00
Anton Hansson
4edcb7efa2 Replace manual genrule modules with combined_apis am: ec450c058e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952377

Change-Id: I5275a7d09ace620d7d685e05492e677669261236
2022-01-18 14:45:32 +00:00
Anton Hansson
09dcc2da3e Merge "Fix test source reference" 2022-01-18 14:43:24 +00:00
Anton Hansson
7e226700a5 Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ...
* changes:
  Create a filegroup for public stub sources
  Minor refactorings in api.go
  Convert merged module lib stub to api.go
  Some minor tweaks for api.go
  Temporarily add support for conditional modules
  Construct sdk-annotations.zip programmatically
  Replace manual genrule modules with combined_apis
2022-01-18 14:18:43 +00:00
Treehugger Robot
78f8ec3696 Merge "[MS63.1] Remove TrafficStats.TAG_SYSTEM_DOWNLOAD dependency" am: a312a961e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952106

Change-Id: I36f6d1d2c5614c1e6e159a039c7a2b73dbf04e3f
2022-01-18 13:20:00 +00:00
Treehugger Robot
a312a961e0 Merge "[MS63.1] Remove TrafficStats.TAG_SYSTEM_DOWNLOAD dependency" 2022-01-18 13:04:35 +00:00
Sorin Basca
e95eaf7f5a Setting ASM to version 7 in sdkparcelables
This is needed when using Java 11 as target.

Test: m
Bug: 195387473
Change-Id: I18abbdfee4039f9a366070b730930396ff4c210e
2022-01-18 09:03:12 +00:00
Meng Wang
7332dedcd1 Fix default value type : should be long instead of int ..
.. for KEY_TIME_TO_SWITCH_BACK_TO_PRIMARY_IF_OPPORTUNISTIC_OOS_LONG
and KEY_OPPORTUNISTIC_TIME_TO_SCAN_AFTER_CAPABILITY_SWITCH_TO_PRIMARY_LONG

Bug: 215048287
Test: make
Change-Id: Ic5505236dd10fad6f9a46e9cf24493d8b4cf8404
2022-01-18 04:57:29 +00:00
Xiao Ma
1c6c66c957 Fix the Preconditions dependency in EthernetNetworkSpecifier.
Ethernet service related files are going to be moved into Connectivity
module. Replace the Preconditions class in the EthernetNetworkSpecifier,
either add modules-utils-preconditions static lib dependency to fix it,
however, notice that will result in the duplicate class import when
moving ethernet stuff to p/m/Connectivity.

Bug: 210586283
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I6163699be4126ef1b95dfb87ec9a6aba2c01195a
2022-01-18 04:50:41 +00:00
Roopa Sattiraju
33a02acc17 Migrating frameworks/base BT files
Bug: 206121418
Test: Compile and Test

Merged-In: Idb55371e9d678296fe46e5f4231ec2d12ec8b978
Change-Id: Idb55371e9d678296fe46e5f4231ec2d12ec8b978
2022-01-17 20:48:03 -08:00
Junyu Lai
45f0d14bc7 [MS63.1] Remove TrafficStats.TAG_SYSTEM_DOWNLOAD dependency
Replace with system Api.

Test: TH
Bug: 204830222
CTS-Coverage-Bug: 215043101
Change-Id: Ic14b26d2862f6fe8bee18fe0c9eaf183052452ee
2022-01-18 02:54:27 +00:00
Junyu Lai
c8e96a462d Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency" am: 6dc2fbcf27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952098

Change-Id: Iad4c3ee01de1ea7e7f23c82a89b7a4c3f4026419
2022-01-18 00:20:05 +00:00
Junyu Lai
6dc2fbcf27 Merge "[MS60] Remove TrafficStats.TAG_SYSTEM_APP dependency" 2022-01-17 23:59:10 +00:00
Anton Hansson
9592c8bb61 Remove defaults that add nothing
This default module seemed pretty pointless.

Test: presubmit
Change-Id: I56115cf5de74174277944f62a1fe017d68a263ae
2022-01-17 19:41:02 +00:00
lifr
c1d2e899ac [DU04-1]Remove NetworkPolicyManagerInternal from NetworkStatsService
Expose system APIs for use by NetworkStatsService.

Bug: 211843446
Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest
            NetworkPolicyManagerServiceTest
Change-Id: I56a066b7f4b4c2c8fefdd185c2e50de63b1e2629
2022-01-18 03:16:51 +08:00
Anton Hansson
4468d7c6bf Create a filegroup for public stub sources
For use by framework-doc-stubs, to avoid duplicating the list of
modules there.

Bug: 169103987
Test: m framework-doc-stubs ; diff intermediates before & after
Merged-In: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
Change-Id: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
2022-01-17 19:07:11 +00:00
Anton Hansson
fd31645f85 Minor refactorings in api.go
- Make a more generically useful "expandArray" function that can handle
  all the various transforms needed here (another one in the next cl).
- Move all the utility functions to the bottom of the file.

Test: presubmit
Merged-In: If0362c6dd90635831ac2cb2f7da336212f4c23fd
Change-Id: If0362c6dd90635831ac2cb2f7da336212f4c23fd
2022-01-17 19:07:10 +00:00
Anton Hansson
cb00f94596 Convert merged module lib stub to api.go
Bug: 169103987
Test: m framework-updatable-stubs-module_libs_api and diff intermediates
      folder before and after.
Merged-In: I6018791ae136bc764a6e846078c6bce59bcc123b
Change-Id: I6018791ae136bc764a6e846078c6bce59bcc123b
2022-01-17 19:07:09 +00:00
Anton Hansson
05e944d8df Some minor tweaks for api.go
- Make constants for re-used hardcoded module names
- Add a removeAll function
- Move filtering into individual "create" methods.

Bug: 169103987
Test: mmm frameworks/base/api
Merged-In: Id81c93eafdbdbbd0f55a4a906150b58a001392f6
Change-Id: Id81c93eafdbdbbd0f55a4a906150b58a001392f6
2022-01-17 19:07:08 +00:00
Anton Hansson
07a1295cfa Temporarily add support for conditional modules
Some bootclasspath libraries are currently conditionally included
in the SDK. Add support for that in api.go.

Bug: 169103987
Test: mmm frameworks/base/api
Merged-In: I7704a884675eb58c429a59f99a663cf09807ecec
Change-Id: I7704a884675eb58c429a59f99a663cf09807ecec
2022-01-17 19:07:07 +00:00
Anton Hansson
cc18e03e44 Construct sdk-annotations.zip programmatically
Avoid hardcoding the list of modules in yet another place.

Bug: 169103987
Test: diff zip before & after (identical)
Merged-In: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
Change-Id: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
2022-01-17 19:07:05 +00:00
Anton Hansson
ec450c058e Replace manual genrule modules with combined_apis
This simplifies the addition of new modules by cutting down the number
of lists that the new module must be added to. The combined_apis module
generates equivalent genrules in a programmatic fashion.

Bug: 169103987
Test: `mmm frameworks/base/api` before and after and compare the soong
      intermediates of that folder.
Merged-In: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
Change-Id: Ia718f9374042e5fbb2168476f5bad3b1867b8a05
2022-01-17 19:07:04 +00:00
William Escande
60fcb1377b Merge "add test coveragee for BtProfileConnectionInfo" am: 55d6ce7be2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934970

Change-Id: Ib4ad986efed8c938d913f02e115bb24391799095
2022-01-17 18:37:07 +00:00
William Escande
55d6ce7be2 Merge "add test coveragee for BtProfileConnectionInfo" 2022-01-17 18:19:11 +00:00
Anton Hansson
7854980515 Fix test source reference
If not referencing the filegroup, the package name is not detected
correctly by metalava. This seems to have led to some IntDefs being
dropped.

Test: m sdk-annotations.zip ; diff before and after (notice
      android.test appearing)
Change-Id: I8db80aca28f73a5425618e82a2d7f5bf14e7e00a
2022-01-17 18:14:55 +00:00
Aaron Huang
b857172c73 Replace buildTemplate* with NetworkTemplate.Builder
NetworkTemplate is going to be moved into mainline module so the
hidden APIs cannot be used anymore.
Therefore, use NetworkTemplate.Builder to create the template
instead.

Bug: 210073043
Test: atest BytesTransferredTest
Change-Id: I5d84d13a75dbafb286e9754421ed17f52c6e22b9
Merged-In: I5d84d13a75dbafb286e9754421ed17f52c6e22b9
2022-01-18 00:45:24 +08:00
Junyu Lai
7b28c1b5af Merge "Fix multipathPolicyTracker query-update loop" am: 8e2a6f76c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951481

Change-Id: Id6a9f13de0feae8abe47b894b672beeba80f3c0e
2022-01-17 16:31:31 +00:00