Commit Graph

190 Commits

Author SHA1 Message Date
Anton Hansson
d22c0fa659 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 am: a914538105
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide06e37c4bec2eac5b65b277307ffcfb96cfedf7
2020-12-23 18:54:04 +00:00
Anton Hansson
f435d200b7 Remove two unused libraries
These were used temporarily before merged stubs were ready,
but they are not used anymore.

Test: m
Change-Id: I517f64353749ffd8d92b8ddbc1dd8b7af75f2176
2020-12-23 14:50:11 +00:00
Anton Hansson
6080e03adf Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
2020-12-22 12:34:57 +00:00
Anton Hansson
121ccbcfee Stop ignoring classes on the classpath for stubs
We're working on moving the libcore classes away from srcs and into the
classpath, and ignoring classes on the classpath will cause incorrect
API signatures once that happens (several libcore classes appear in
public API signatures).

Keep the docs building in the same way they were before. They will be
addressed in separate CLs.

Bug: 173606718
Test: m checkapi
Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
2020-12-21 10:46:53 +00:00
Paul Duffin
24c79cdb88 Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
2020-12-11 10:50:29 +00:00
Paul Duffin
5a4e8f234d Unbundle i18n API from android-non-updatable
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.

The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.

The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.

Bug: 174344410
Test: m offline-sdk-docs
      - check that i18n classes are present
      m android_stubs_current android_system_stubs_current android_test_stubs_current
      - check that i18n classes are present in each jar
      m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
2020-12-10 11:23:19 +00:00
Jayachandran C
0f14f81d7c Add indication APIs to expose QOS from LTE and NR bearers
Add indication APIs to expose Quality Of Service (QOS) information
from LTE and NR default as well as dedicated bearers. The QOS is
added to the existing SetupDataCallResult structure so that the
baseband can notify whenever there is a change in QoS on a PDN.

Bug: 158315614
Test: 1) Simulated V1_6 SetupDataCallResult and verified the Qos objects
         are passed correctly in the APIs
      2) atest frameworks/opt/telephony/tests/telephonytests/

Merged-In: I29b13975288286d9706a1c3fb227eeb46527efc3
Change-Id: I29b13975288286d9706a1c3fb227eeb46527efc3
2020-12-04 03:24:39 +00:00
Jayachandran Chinnakkannu
a2d72341a7 Merge "Add indication APIs to expose QOS from LTE and NR bearers" 2020-11-18 23:59:22 +00:00
Treehugger Robot
2a2108e7d7 Merge "Fix disting of android_system.jar" am: 0206a453f1 am: fad6403b9f am: 5294410614 am: 08290119fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503392

Change-Id: I5e0f69aa407d52dc41f163c9d3671baf6e21153b
2020-11-18 22:52:15 +00:00
Treehugger Robot
0206a453f1 Merge "Fix disting of android_system.jar" 2020-11-18 20:40:43 +00:00
Anton Hansson
c3002e5ec4 Fix disting of android_system.jar
The change I41b38d4828f8dc5d90dbb3ae59462812b8c036f2 accidentally
started disting the public android.jar to the path where the system
android.jar is expected.

Move the dist rules from the public stubs to the system stubs where
they belong.

Bug: 172937217
Test: m sdk dist && \
      zipinfo out/dist/apistubs/android/system/android.jar | \
      fgrep telecom/Phone.class
Change-Id: If20cb4ec32e1eb631a824ecc180d33c5088ff7c8
2020-11-18 18:37:34 +00:00
Jayachandran C
c4faf84942 Add indication APIs to expose QOS from LTE and NR bearers
Add indication APIs to expose Quality Of Service (QOS) information
from LTE and NR default as well as dedicated bearers. The QOS is
added to the existing SetupDataCallResult structure so that the
baseband can notify whenever there is a change in QoS on a PDN.

Bug: 158315614
Test: 1) Simulated V1_6 SetupDataCallResult and verified the Qos objects
         are passed correctly in the APIs
      2) atest frameworks/opt/telephony/tests/telephonytests/

Change-Id: I29b13975288286d9706a1c3fb227eeb46527efc3
2020-11-18 10:25:22 -08:00
Anton Hansson
2feb3f1369 Cleanup in StubLibraries.bp
- Merge the "full" defaults into the "base" defaults (base wasn't used)
- Reword some comments
- Fix double mention of priv_apps @SystemApi annotation in a droidstub

Test: m checkapi
Change-Id: Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6
(cherry picked from commit 1c58ffce6c)
2020-11-17 19:11:24 +00:00
Anton Hansson
1c58ffce6c Cleanup in StubLibraries.bp
- Merge the "full" defaults into the "base" defaults (base wasn't used)
- Reword some comments
- Fix double mention of priv_apps @SystemApi annotation in a droidstub

Test: m checkapi
Change-Id: Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6
Merged-In: Ide93b0f6076fec733f5a01b7fccbf280d5a8d0f6
2020-11-17 19:07:36 +00:00
Anton Hansson
d13bbe78eb Merge "Remove api-stubs-docs" am: 8cddd53381 am: 4ef05f5c6c am: 2eed87d3b5 am: 97b23b05dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498698

Change-Id: I317759fc854819fbe8e5ceea84baff3717933172
2020-11-16 14:39:52 +00:00
Anton Hansson
51861e70e5 Remove api-stubs-docs
Remove the build rule for updating api/current.txt and other files,
which makes it easier to remove the txt files themselves.

Bug: 171029603
Test: m nothing
Change-Id: I987fd9f6075d0f7c6817f16bf7282c6239afb7db
2020-11-13 11:31:36 +00:00
Anton Hansson
1a9cceff66 Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099 am: 4d6f4e1374 am: 557f955774
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267

Change-Id: I4ab40120d1d2e6a2e4d70ea0fc9138a2f6c0e088
2020-11-12 14:53:24 +00:00
Anton Hansson
5426f50028 Remove the system-api-stubs-docs target
Nothing consumes the output of this module anymore. The txt files
themselves will be removed in a follow-up change (it is easier after
this build rule stops them changing all the time).

Bug: 171029603
Test: m checkapi with txts removed
Change-Id: Iac487dd6c62504b33cf4e372ba4a7cf9808bf5fc
2020-11-11 16:32:53 +00:00
Anton Hansson
552ba2c492 Move testapi API files for symmetry with others
The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.

Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
Merged-In: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
(cherry picked from commit 3a1b1bd620454dd1d5b328c98634a567865cd55e)
2020-11-05 14:04:24 +00:00
Anton Hansson
022aac54d2 Move testapi API files for symmetry with others
The other non-updatable API files are in core/api/*. Also add
-non-updatable to the module to match the others.

Bug: 171029603
Test: m checkapi
Change-Id: I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5
2020-11-05 14:02:48 +00:00
Anton Hansson
65aa6ea9d1 Remove unused monolithic jars
Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.

Rename the merged variants instead of having duplicate compilation
rules.

Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
2020-11-05 09:25:46 +00:00
Ytai Ben-tsvi
df2e907e08 Merge changes from topic "aidlize-audioflinger"
* changes:
  Remove manual parceling from Interpolator and VolumeShaper
  Add av-types-aidl to libandroid_runtime, libmedia_jni
  Add dependencies to libandroid_runtime, libmedia_jni
  Add dependency to libandroid_runtime
2020-11-04 21:03:37 +00:00
Anton Hansson
88f18690f7 Merge "Dist merged jar instead of monolithic one" am: 7350b62384 am: e39d2d9f8c am: cd873a8792 am: 0760665ae2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: Ib2598301fce47c845953a66d8a74d78a2b1bcd5d
2020-11-04 18:23:05 +00:00
Ytai Ben-Tsvi
c3cd3cda9b Remove manual parceling from Interpolator and VolumeShaper
Change-Id: Ic5c3bfeb67c6e1b9b2b3c6275ea4badbef8536d3
2020-11-03 16:21:15 -08:00
Anton Hansson
3a8e03610b Remove unused monolithic jars
Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.

Rename the merged variants instead of having duplicate compilation
rules.

Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
Merged-In: I7859589b93b861439fb1b7de084e52294da53671
2020-11-03 19:38:55 +00:00
Anton Hansson
533fb47c7e Dist merged jar instead of monolithic one
The monolithic ones are being deleted in a follow-up CL.

Bug: 158465496
Test: m sdk dist
Change-Id: I41b38d4828f8dc5d90dbb3ae59462812b8c036f2
2020-11-03 19:33:50 +00:00
Anton Hansson
ad2bb796b0 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 15:22:45 +00:00
Anton Hansson
5715f92949 Merge "Move non-updatable-api/ to core/api/" 2020-10-30 11:03:28 +00:00
Anton Hansson
5cbcb587af Merge "Remove the module-lib-api target" am: 36bd16e5ab am: 0a354a95f4 am: 0a111c1280 am: 1befdc9e4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480536

Change-Id: I312eb37caed125f12fd3bd8c4e3e1741062b2810
2020-10-30 10:37:08 +00:00
Anton Hansson
6cbaff2471 Move non-updatable-api/ to core/api/
This achieves two things:
- it's been noted that non-updatable-api is a confusing term as it has
  to be updated every time the API changes
- the api-review logic trigers on txt files in subdirs named 'api',
  which non-updatable-api does not trigger on

I will (less urgently) try to get rid of the term "non-updatable" from
other places too, perhaps going for "non-module" or "core" as a
replacement.

Bug: 171029603
Test: m checkapi
Change-Id: I843efb4880b6caaf3872e9b0918fd710fb93d979
2020-10-30 08:23:20 +00:00
Anton Hansson
7bfceb87e1 Move non-updatable-api/ to core/api/
This achieves two things:
- it's been noted that non-updatable-api is a confusing term as it has
  to be updated every time the API changes
- the api-review logic trigers on txt files in subdirs named 'api',
  which non-updatable-api does not trigger on

I will (less urgently) try to get rid of the term "non-updatable" from
other places too, perhaps going for "non-module" or "core" as a
replacement.

Bug: 171029603
Test: m checkapi
Change-Id: I843efb4880b6caaf3872e9b0918fd710fb93d979
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
2020-10-29 18:59:10 +00:00
Anton Hansson
43cc8bf55c Remove the module-lib-api target
This target existed just to track the "full" module lib API surface,
until the individual pieces had the same standards. However, now:
- the full current.txt file is available as a build target
- all the individual .txt files are API reviewed, checked against
last api, linted, and changes result on API council bug updates

The .txt files will be removed in a separate CL.

Bug: 171029603
Test: m checkapi
Change-Id: Ib8ec547871045f77fb73aa82f192b5a7767d0c33
2020-10-29 18:56:10 +00:00
Anton Hansson
cf42dd7c97 Merge "Annotate large droidstubs modules high_mem" am: 6aebdcbcb8 am: 13444871fb am: 9563c9801a am: 6ba7230ad9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473726

Change-Id: Ifca23833fd586b4dc82d076df51d47018416649c
2020-10-27 09:39:42 +00:00
Anton Hansson
3514689f05 Annotate large droidstubs modules high_mem
Previously all droidstubs modules were classified as highmem. Annotate
only the huge modules as such, to allow more parallelization of lowmem
droidstubs modules.

Bug: 170701554
Test: NINJA_HIGHMEM_NUM_JOBS=3 m checkapi
Change-Id: I83ae88222110d7afe4009076e951c88a5188ca83
2020-10-26 11:38:44 +00:00
Anton Hansson
7ce31c12ab Remove module source code from test-api-stubs-docs
This makes it impossible to add new @TestApi in modules, of which
there are none right now and we don't want any going forwards, either.

Bug: 170395679
Test: m test-api-stubs-docs-check-current-api
Change-Id: I527ca7b580350372bee72b65f6596a46eab2ce04
2020-10-15 18:38:49 +01:00
Anton Hansson
7110ae7a28 Remove module source code from test-api-stubs-docs
This makes it impossible to add new @TestApi in modules, of which
there are none right now and we don't want any going forwards, either.

Bug: 170395679
Test: m test-api-stubs-docs-check-current-api
Change-Id: I527ca7b580350372bee72b65f6596a46eab2ce04
Merged-In: I527ca7b580350372bee72b65f6596a46eab2ce04
2020-10-15 18:38:33 +01:00
Anton Hansson
ae26decc8e Merge "Have test_current be a union of system and test APIs" 2020-10-14 14:43:03 +00:00
Anton Hansson
1af66d72f2 Merge "Remove removed-dex-api generation" am: 83d9ddc6cb am: 4f3d7a966f am: cbeab42fd6 am: 82cbd820f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457761

Change-Id: Iab0d1daf4c564c69460f4241b3269e38f769d537
2020-10-14 13:34:51 +00:00
Anton Hansson
3142e68403 Merge "Remove jdiff_enabled from platform metalava runs" am: 02ca5fcbe7 am: 0e45be9aa5 am: 525db31892 am: 4b76503c8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454976

Change-Id: Ia7fbdc74de136ff4140bf34adf43e472381ccfff
2020-10-13 09:31:54 +00:00
Anton Hansson
03b48e3fbe Remove removed-dex-api generation
Nothing uses these outputs anymore. The compat tools have been
migrated to use a new file in I082d18fc2b8a57ea8c5941d5c955a7970ab9d860.

Bug: 158465496
Test: presubmit
Change-Id: I51a1f3f5e43092f5431358d705379cc33b60b835
2020-10-13 09:38:44 +01:00
Anton Hansson
84ffba267e Have test_current be a union of system and test APIs
Include @SystemApi APIs in the test_current stub jar, while keeping
the @TestApi and @SystemApi API txt files tracked separately.

A side-effect of this change is that string constants of @SystemApi
permissions are no longer inlined in the test api tracking, possibly
because metalava was previously incorrectly peeking at @SystemApi
whereas it is now explicitly forbidden to do so. I don't believe the
API txt change has any practical effects.

Bug: 129133308
Test: presubmit
Change-Id: I23d3c88624ee7599485c3390a0440b78bc18a0a2
Merged-In: I23d3c88624ee7599485c3390a0440b78bc18a0a2
2020-10-13 08:25:03 +01:00
Anton Hansson
2da95f38c1 Merge "Have test_current be a union of system and test APIs" 2020-10-13 07:22:24 +00:00
Amy Zhang
782aa9006b Add Tuner 1.1 constants as a required lib of framework-non-updatable-sources
Test: make -j44 dist
Bug: 158816517
Bug: 159058358
Change-Id: Ia47c05a8094b28a3e84b7e57386ced7a70d26a98
2020-10-12 13:55:52 -07:00
Anton Hansson
374c51141a Remove jdiff_enabled from platform metalava runs
The official API differences report is not produced from the
artifacts this rule creates, but by manually running metalava
with the right txt files.

As there are no other known users of these jdiff files, remove them
for now.

Bug: 158465496
Test: m
Change-Id: Iee9dd1a5d5543f3f629e3631c8224e6bfe4dddcb
2020-10-12 18:49:44 +01:00
Anton Hansson
34529139fd Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b am: b5fcebde9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979

Change-Id: Id64f6017e54e27d97c822e62a85e0221a2454bfa
2020-10-12 12:27:13 +00:00
Anton Hansson
186229a227 Merge "Add appsearch and graphics to module lists" 2020-10-12 10:45:55 +00:00
Anton Hansson
99398da506 Merge "Move the dist rules from monolithic to merged rules" 2020-10-12 10:45:13 +00:00
Anton Hansson
a2b349773a Have test_current be a union of system and test APIs
Include @SystemApi APIs in the test_current stub jar, while keeping
the @TestApi and @SystemApi API txt files tracked separately.

A side-effect of this change is that string constants of @SystemApi
permissions are no longer inlined in the test api tracking, possibly
because metalava was previously incorrectly peeking at @SystemApi
whereas it is now explicitly forbidden to do so. I don't believe the
API txt change has any practical effects.

Bug: 129133308
Test: presubmit
Change-Id: I23d3c88624ee7599485c3390a0440b78bc18a0a2
2020-10-10 09:34:28 +01:00
Anton Hansson
ae4332dc69 Move the dist rules from monolithic to merged rules
These API tracking files are identical except for 2 inlined permission
constants in the public API, which do not matter.

```
@@ -31606 +31606 @@
-    method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_SETUP_WIZARD"}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
@@ -31634 +31634 @@
-    method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_CARRIER_PROVISIONING"}) public void removePasspointConfiguration(String);
+    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
```

Bug: 158465496
Test: lunch sdk_phone_armv7 ; m sdk dist ; diff artifacts
Change-Id: Ibde9310bb1f5c0921962c022e158a861b233f6d1
2020-10-09 14:45:24 +01:00
Anton Hansson
59e35965ee Merge "Convert appsearch to java_sdk_library" 2020-10-09 12:49:43 +00:00