Commits · 1385c1701d1b57fd93a966f28bbd6a3075d8ff93 · Dhina17 / platform_frameworks_base

Oct 12, 2023

Merge "Add module lib and test union java_api_library module" into main am: · 1385c170

Jihoon Kang authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453

Change-Id: I2e987f35dcbd190db7171a9ba6e5cace06a08607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1385c170

Merge "Fix broken links to AudioVolumeGroup" into main am: · 5cf090c1

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784249

Change-Id: I50c2805f1ad233ab2b922af95d73b0d6094f4275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5cf090c1

Merge "Add module lib and test union java_api_library module" into main · d135292f
Jihoon Kang authored 1 year ago

d135292f
Merge "Fix broken links to AudioVolumeGroup" into main · 47c10d04
Anton Hansson authored 1 year ago

47c10d04

Merge "Add dakinola@ to OWNERS in media/projection" into main am: · 8a9616e9

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786479

Change-Id: Ie91f7e4e043d0ee23a9819edc02b7fa01d98e508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8a9616e9

Fix broken links to AudioVolumeGroup · 49bee42f

Anton Hansson authored 1 year ago

AudioVolumeGroup is not public API, so cannot be linked from public
API javadoc.

Bug: 303184203
Test: m docs
Change-Id: I5026446e03921f7057b97806afadcd127f37e4fd

49bee42f

Merge "Add dakinola@ to OWNERS in media/projection" into main · ef2cbcd7
Treehugger Robot authored 1 year ago

ef2cbcd7
Add dakinola@ to OWNERS in media/projection · 645ba4b0
Chris Göllner authored 1 year ago
```
Change-Id: Ia42f7a7b3f3eedd4fa784997686185125014a03c
```
645ba4b0

Merge "Update haptics framework owners file" into main am: · 15b8d464

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778550

Change-Id: I20f9f49b657626186830e555c05b6b359d92e43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

15b8d464

Merge "Update haptics framework owners file" into main · df5f4b52
Treehugger Robot authored 1 year ago

df5f4b52

Oct 11, 2023

Merge "Prepare for keeping concrete overrides of abstract methods" into main am: · 02afbeb8

Jihoon Kang authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781309

Change-Id: I1604b66bd8548f5a2a9b434f319c68dd84bc6ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

02afbeb8

Merge "Prepare for keeping concrete overrides of abstract methods" into main · fc916490
Jihoon Kang authored 1 year ago

fc916490

Merge changes from topic "locksettings-aosp-3" into main am: · 9621fefc

Eric Biggers authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779368

Change-Id: I33f797f882c9f8262393cab022fa9cb31dc13fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9621fefc

locksettings: Don't use AIDL V1 weaver am: · 97ea5b20

Yi-Yo Chiang authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781897

Change-Id: I39bf738b0b296ebbb669e8c7a872d1444535d9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

97ea5b20

Reconnect if weaver service connection dies am: · 1a97a06c

Eric Biggers authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781896

Change-Id: I648bd8d0d1ad0f73eab1f32f3c0826e6ba0a8005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1a97a06c

Replace isWeaverAvailable() with getWeaverService() am: · 2032bc0b

Eric Biggers authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781895

Change-Id: If054c78c82155db7bcfde36b841b0a50c0fac357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2032bc0b

Merge changes from topic "locksettings-aosp-3" into main · cf7db52d

Eric Biggers authored 1 year ago

* changes:
  LockSettingsService: fix names of user lifecycle methods
  locksettings: Don't use AIDL V1 weaver
  Reconnect if weaver service connection dies
  Replace isWeaverAvailable() with getWeaverService()

cf7db52d

Merge "Cleanup obsolete doc build targets" into main am: · b058ee56

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781371

Change-Id: I61f4dfee2dba1f5558bba36022912f9163d8be18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b058ee56

Merge "Make sure we'll always kill process group" into main am: · 4181591e

T.J. Mercier authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780968

Change-Id: I3cf8dfb7146203986436a79ad493f25c8072a6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4181591e

Merge "[aapt2] Generate @FlaggedApi annotations" into main am: · 5fe48781

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783692

Change-Id: I7ec20553e60748c6790dbe4e8b9951cf83e1455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5fe48781

Merge "Cleanup obsolete doc build targets" into main · a445bfed
Anton Hansson authored 1 year ago

a445bfed
Merge "Make sure we'll always kill process group" into main · 2ff53e43
T.J. Mercier authored 1 year ago

2ff53e43
Merge "[aapt2] Generate @FlaggedApi annotations" into main · 5f951b7f
Treehugger Robot authored 1 year ago

5f951b7f

Merge "Revert "Update AudioFormat setChannelMask comment"" into main am: · 713b52e4

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784168

Change-Id: I45594ccfaf8e37d84ebbb363410349d24964cd10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

713b52e4

Merge "Remove framework-doc-only-libs" into main am: · d9105800

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780989

Change-Id: I516cdc82ad7a4efbdd2242adbded20effd8c1c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d9105800

Merge "Update OWNERS for ravenwood" into main am: · 3f3b1bfa

Makoto Onuki authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781887

Change-Id: Ic4a2fd33d002eb7c5044b5a438f0fb8b1365802e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3f3b1bfa

Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main am: · a6cccd04

Shaquille Johnson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784108

Change-Id: I925ca6d0d4709cc206accf64c412f97f175499d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a6cccd04

Merge "Don't link the framework impl in docs build" into main am: · 37ec16d5

Anton Hansson authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784307

Change-Id: I1aee06bc3ee0e725985c4dfebc4b9f1d6cc4cb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

37ec16d5

Merge "Revert "Update AudioFormat setChannelMask comment"" into main · 5908942b
Anton Hansson authored 1 year ago

5908942b
Merge "Remove framework-doc-only-libs" into main · 13fc49ae
Anton Hansson authored 1 year ago

13fc49ae
Merge "Update OWNERS for ravenwood" into main · f5b8b2bf
Makoto Onuki authored 1 year ago

f5b8b2bf
Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main · d3a0d02b
Shaquille Johnson authored 1 year ago

d3a0d02b
Merge "Don't link the framework impl in docs build" into main · 13bced3c
Anton Hansson authored 1 year ago

13bced3c

Add module lib and test union java_api_library module · 4683b14c

Jihoon Kang authored 1 year ago

Currently, hiddenapi_modular defines test api surface as a subset of
module lib api surface, causing hiddenapi check failure in from-text
stub build. In order to mitigate this and enable the hiddenapi check in
from-text stub build, this change introduces a java_api_library module
that generates the stub jar that contains both test and module lib
api contributions. The module will not be available for consumption, but
will only be used in hiddenapi check.

Test: m android_test_module_lib_stubs_current.from-text --build-from-text-stub
Bug: 191644675
Change-Id: I2b6c9f75d9ebcfd75fa5b509dbef14aa0f88ac97

4683b14c

[aapt2] Generate @FlaggedApi annotations · 636b6283

Mark Punzalan authored 1 year ago

Like we currently do for @TestApi and @SystemApi, we look for
"@FlaggedApi" and its parameters in the comment above the resource.

Bug: 295328308
Test: Did the following:
1. Ran `atest aapt2_tests`
2. Ran `aapt2 link` on public-staging.xml with an added @FlaggedApi
   in the comment for the resource currently there. Verified the
   @FlaggedApi annotation is present in the generated R.java.
3. Ran `m framework-minus-apex` and it built successfully.
4. Modified the @FlaggedApi comment with an invalid value (e.g.,
   `Flags.FOO` which does not exist). The build failed. Since
   @FlaggedApi is a source-only annotation (i.e., not present in the
   R.class file), we want to verify it was actually used in the build.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6fa7a3c7c5213ad3a94406f46fec6d1219b3fa43)
Merged-In: I0739f888d40269915c0acea5650c386da1a1782e
Change-Id: I0739f888d40269915c0acea5650c386da1a1782e

636b6283

Cleanup obsolete doc build targets · 2e6a904a

Anton Hansson authored 1 year ago

- the *-check-docs target doesn't do anything the other targets don't
- online-* are, I think, the old d.a.c targets but the ds-* targets are
  what's currently used
- the hidden-* target isn't meaningfully different from others, either

Test: presubmit
Change-Id: Icab977d40917aa14c629629965c6126e20f4f3ee

2e6a904a