Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taran Singh
894e1ceea9 Fix NavigationBarColorTest 
Manually partially revert I4910c2a06cc67b0470477b245fc1de54b75f10f9 so
that we don't use a window that's animating away as control target.

Fix: 161659326
Bug: 153145997
Test: atest NavigationBarColorTest#testSetNavigationBarColor

Bug: 167499521
Fixed: 167499521
Exempt-From-Owner-Approval:‌ ‌Cherry-pick of downstream change
Merged-In: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
Change-Id: I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b
(cherry picked from commit 588fa46cf4)
 2020-09-02 18:01:19 +00:00
TreeHugger Robot
14a9e208c7 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 18:00:38 +00:00
Bill Yi
5973de4c9b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I309444f9cb42f16caf710e8c5f4854ba6aafc937
 2020-09-02 17:41:48 +00:00
TreeHugger Robot
e8dfd91dbf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b1f16b637e -s ours am: 372c5529d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ae54ba86027d0516f2e74b63928691d935ae3c7
 2020-09-02 16:37:46 +00:00
TreeHugger Robot
24c7da72ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd326a21d4 -s ours am: 398c2db050 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf76a8cdeffb7f5702d58358c0333d261357edd7
 2020-09-02 16:37:36 +00:00
TreeHugger Robot
81c0905c57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c592 -s ours am: 921f98c788 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice1a549330ca55b6bee9368d47362117280585e9
 2020-09-02 16:37:12 +00:00
Anton Hansson
ed87582c20 [automerger skipped] Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa am: e0bd94e37d -s ours am: 98a01b7fad -s ours am: 7eabaf095d -s ours 
am skip reason: Change-Id I907533c36dcb6c0ef679b0098d497d88476d8b95 with SHA-1 bace9a17a7 is in history

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

Change-Id: If85f101520d8cdc002e21d142b3e611fe65c4673
 2020-09-02 16:36:58 +00:00
TreeHugger Robot
372c5529d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b1f16b637e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85fa12bd79a77cad1067655a76ca1943e4b1f598
 2020-09-02 16:36:56 +00:00
Anton Hansson
ef2af20149 [automerger skipped] Merge "Make module stubs publicly visible" am: 09399b385c -s ours am: 8cce84605e -s ours am: 0f93824ccb -s ours 
am skip reason: Change-Id Id0eee4bf4e78f5dfddf6ad569e49719fefde658e with SHA-1 d346b43c1f is in history

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

Change-Id: I5fcc94d7f587db7367d590fb79b32f354c2dc04b
 2020-09-02 16:36:46 +00:00
TreeHugger Robot
398c2db050 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd326a21d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5efd4176385e7662de108abec1de06976d607886
 2020-09-02 16:36:41 +00:00
Anton Hansson
ace83ac241 [automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -s ours am: 54a9b57203 -s ours 
am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b243f is in history

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

Change-Id: I7243638eb8dcb3c7176841c14cd2bc2f506396cc
 2020-09-02 16:36:08 +00:00
TreeHugger Robot
921f98c788 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c592 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32f8fdc2a6b9e1e23bca027ad7707b367e2e4cf5
 2020-09-02 16:36:03 +00:00
Treehugger Robot
8d0165a311 Merge "Add tigerhuang to the owner list of WM" am: 5e1dfe5eb9 am: b578134162 am: fdf080faf6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417034

Change-Id: I40448aadf1c58c4868c9089a912aad468385ac44
 2020-09-02 16:35:48 +00:00
Automerger Merge Worker
ff0242b9b5 Merge "Merge "Check error status after installing each DSU partition" am: fbd85db85d" into stage-aosp-master am: a70e17604c am: 7005dbfb6d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: Ic87b894a6512396b04c636481c1bffe627baf1fe
 2020-09-02 16:35:36 +00:00
Xin Li
0a92958b74 [automerger skipped] Merge "Whitelist settings robotests to access wifi impl details" into stage-aosp-master am: 841c88d804 -s ours am: 8b7da13b31 -s ours 
am skip reason: Change-Id Id283ecb2b9b8bd087028f9a68604adc516e9ea9e with SHA-1 f7c2162913 is in history

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

Change-Id: I51e307c7b1b35e673fc62d4512084bd931a022a5
 2020-09-02 16:34:49 +00:00
Anton Hansson
7eabaf095d [automerger skipped] Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa am: e0bd94e37d -s ours am: 98a01b7fad -s ours 
am skip reason: Change-Id I907533c36dcb6c0ef679b0098d497d88476d8b95 with SHA-1 bace9a17a7 is in history

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

Change-Id: I068a647bce7a36766b0857ce5d93c93f85a4a1d1
 2020-09-02 16:33:50 +00:00
TreeHugger Robot
b1f16b637e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:19:58 +00:00
TreeHugger Robot
dd326a21d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:18:21 +00:00
TreeHugger Robot
051a24c592 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:11:06 +00:00
Anton Hansson
0f93824ccb [automerger skipped] Merge "Make module stubs publicly visible" am: 09399b385c -s ours am: 8cce84605e -s ours 
am skip reason: Change-Id Id0eee4bf4e78f5dfddf6ad569e49719fefde658e with SHA-1 d346b43c1f is in history

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

Change-Id: Ibad1f221127172429da16eb9d05a4320c005b9ec
 2020-09-02 16:01:27 +00:00
Anton Hansson
54a9b57203 [automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours am: 4a1dceff0a -s ours 
am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b243f is in history

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

Change-Id: I547e5f944cce38dc09b8d3e4fef7f77338139489
 2020-09-02 16:01:14 +00:00
Anton Hansson
98a01b7fad [automerger skipped] Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa am: e0bd94e37d -s ours 
am skip reason: Change-Id I907533c36dcb6c0ef679b0098d497d88476d8b95 with SHA-1 bace9a17a7 is in history

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

Change-Id: I608df7327b8366fd365b11c6bdff9ed28fde99b0
 2020-09-02 16:01:10 +00:00
Treehugger Robot
fdf080faf6 Merge "Add tigerhuang to the owner list of WM" am: 5e1dfe5eb9 am: b578134162 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417034

Change-Id: I5d89cfddd345fbb18f58a51efb8670260d594202
 2020-09-02 16:00:58 +00:00
Automerger Merge Worker
7005dbfb6d Merge "Merge "Check error status after installing each DSU partition" am: fbd85db85d" into stage-aosp-master am: a70e17604c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: Iad7a1096facc4f32b23eef3a41d06e0c7fe6d76d
 2020-09-02 16:00:49 +00:00
Xin Li
8b7da13b31 [automerger skipped] Merge "Whitelist settings robotests to access wifi impl details" into stage-aosp-master am: 841c88d804 -s ours 
am skip reason: Change-Id Id283ecb2b9b8bd087028f9a68604adc516e9ea9e with SHA-1 f7c2162913 is in history

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

Change-Id: I5748c000073e04769284e948b1d3290d015815bc
 2020-09-02 16:00:11 +00:00
Anton Hansson
8cce84605e [automerger skipped] Merge "Make module stubs publicly visible" am: 09399b385c -s ours 
am skip reason: Change-Id Id0eee4bf4e78f5dfddf6ad569e49719fefde658e with SHA-1 d346b43c1f is in history

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

Change-Id: I8497a4acf15b8fcd1771381b82b9645850d9559d
 2020-09-02 15:56:58 +00:00
Anton Hansson
4a1dceff0a [automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2c3 -s ours 
am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b243f is in history

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

Change-Id: I1e72fe622f78933f345c6cc7473d6f59dd9b306f
 2020-09-02 15:51:14 +00:00
Treehugger Robot
b578134162 Merge "Add tigerhuang to the owner list of WM" am: 5e1dfe5eb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1417034

Change-Id: I3564cb4879e313dca6b3c5e456c01b2f08ae725a
 2020-09-02 15:45:38 +00:00
Automerger Merge Worker
a70e17604c Merge "Merge "Check error status after installing each DSU partition" am: fbd85db85d" into stage-aosp-master 2020-09-02 15:44:57 +00:00
Xin Li
841c88d804 Merge "Whitelist settings robotests to access wifi impl details" into stage-aosp-master 2020-09-02 15:42:58 +00:00
Yo Chiang
3ad013e327 Merge "Check error status after installing each DSU partition" am: fbd85db85d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: Ic56f944caf6b9c388f5275d098548a072698fbad
 2020-09-02 15:39:39 +00:00
Bill Yi
cc8884cdc2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieacb3bfa2b943e92e33184c3a2a261ef2208d349
 2020-09-02 15:16:52 +00:00
Anton Hansson
e0bd94e37d Merge changes I907533c3,I8502eb90,I60c82e0f,Id4070113,I31c6d0fa 
* changes:
  Switch service-permissions to java_sdk_library
  Make module apis dist their output
  Include annotations in module metalava runs
  Dist module stub libraries for in sdk builds
  Use module_current to build module stubs
 2020-09-02 14:21:45 +00:00
Anton Hansson
09399b385c Merge "Make module stubs publicly visible" 2020-09-02 14:13:49 +00:00
Anton Hansson
680906b2c3 Merge "Enable annotations for framework stubs" 2020-09-02 11:36:35 +00:00
Bill Yi
58c5676cbd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icfc7040f0aa854fc81bf34f69c31ba2bcce13c2e
 2020-09-02 11:10:20 +00:00
Paul Duffin
0a6553cc6f Switch service-permissions to java_sdk_library 
(partial cherry-pick)

Previously, the droidstubs generated the system-server API into the
current.txt and removed.txt files which are usually associated with the
public API surface. This change moves that specification into the
system-server....txt files and verifies that no public APIs are leaking
into the stubs.

Bug: 155164730
Test: m java
Merged-In: I907533c36dcb6c0ef679b0098d497d88476d8b95
Change-Id: I907533c36dcb6c0ef679b0098d497d88476d8b95
 2020-09-02 12:10:15 +01:00
Anton Hansson
db43d8f3ab Make module apis dist their output 
Only populate the targets and dir attributes. The output name
will be autopopulated to the filename, which differs by module.

Bug: 149293194
Test: m dist sdk && find out/dist/apistubs -name 'framework-*.txt'
Change-Id: I8502eb90a10d8b1ca998c2eba5646c662638ce3f
Merged-In: I8502eb90a10d8b1ca998c2eba5646c662638ce3f
(cherry picked from commit a92a23bc69)
 2020-09-02 12:10:15 +01:00
Anton Hansson
8e4f83b9eb Include annotations in module metalava runs 
Without this, we don't get nullability annotations in the stub sources,
nor the stubs themselves, which is a requirement for good interop with
kotlin.

Bug: 157010342
Test: m
Test: javap -c -v out/soong/.intermediates/frameworks/base/apex/media/\
framework/framework-media-stubs-publicapi/android_common/javac/classes/\
android/media/MediaSession2.class | grep Null && echo success || echo fail

Change-Id: I60c82e0fd495d379d7107e43542b846ca50b1e96
Merged-In: I60c82e0fd495d379d7107e43542b846ca50b1e96
 2020-09-02 11:29:03 +01:00
Anton Hansson
6f646a5f13 Dist module stub libraries for in sdk builds 
Makes the stub libraries accessible to update_prebuilts.py,
so they can be finalized together with their txt files (already dist'd).

Bug: 149293194
Test: m dist sdk && find out/dist -name 'framework-*.jar'
Change-Id: Id4070113bf786bf79573d7b29cd98fcd86e20851
Merged-In: Id4070113bf786bf79573d7b29cd98fcd86e20851
(cherry picked from commit 5259a14d53)
 2020-09-02 11:24:26 +01:00
Anton Hansson
369bafac96 Use module_current to build module stubs 
module_current is always built from sources, whereas the
other SDK jars are being transitioned to be composed of
a set of stubs. This avoids the dependency cycle of module
stubs depending on themselves.

Bug: 144149403
Test: m
Change-Id: I31c6d0fa958aa502131352716a9f950828b7829c
Merged-In: I31c6d0fa958aa502131352716a9f950828b7829c
(cherry picked from commit eb34cbee12)
 2020-09-02 11:21:13 +01:00
Anton Hansson
02e7f10464 Make module stubs publicly visible 
Previously they were limited to frameworks/base so that they could be
combined into the "main" android stubs. However, limiting their
visibility is inflexible and unnecessary, and due to limitations in the
build system also makes it impossible to create rules for prebuilts of
these module stubs that set `prefer: false`.

This CL makes it possible to disable the prebuilts, which multiple
downstream branches would like to do.

Bug: 159902351
Test: m nothing (with prefer: false on prebuilts)
Change-Id: Id0eee4bf4e78f5dfddf6ad569e49719fefde658e
Merged-In: Id0eee4bf4e78f5dfddf6ad569e49719fefde658e
(cherry picked from commit d346b43c1f)
 2020-09-02 10:54:34 +01:00
Anton Hansson
7d74e595bb Enable annotations for framework stubs 
Keeps Nullable and other source retention annotations in the stubs.

Bug: 157010342
Test: diff_stubs.sh
Change-Id: I4fc66d607276ff885947489afd63e1370ec85939
Merged-In: I4fc66d607276ff885947489afd63e1370ec85939
(cherry picked from commit 01ff6b243f)
 2020-09-02 10:46:30 +01:00
Bill Yi
4710e8ee67 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6f47cb705c3455d1eafa2f65268941f004cae0f9
 2020-09-02 09:30:14 +00:00
Bill Yi
61e6d5c465 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8241f2ba0efca5d797b4b123bf19fb791406ef58
 2020-09-02 08:22:50 +00:00
Treehugger Robot
5e1dfe5eb9 Merge "Add tigerhuang to the owner list of WM" 2020-09-02 08:08:48 +00:00
Bill Yi
cf065fe413 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id9fb59a0cdc70d3cb23efd38534598af97ddc5f9
 2020-09-02 07:49:47 +00:00
Anton Hansson
0dc853e9fa Whitelist settings robotests to access wifi impl details 
The test is already accessing these via robolectric leaking the impl
jar, so make the dep explicit.

Note that the merged-in tag is unrelated to the actual change.

Bug: 157451444
Bug: 161767237
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: Id283ecb2b9b8bd087028f9a68604adc516e9ea9e
Change-Id: Id283ecb2b9b8bd087028f9a68604adc516e9ea9e
(cherry picked from commit f7c2162913)
 2020-09-02 07:35:57 +00:00
Bill Yi
19538c4120 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id70946a77cf24e35759edbe7ecdf45ca3f0a3cd5
 2020-09-02 07:12:51 +00:00
Yo Chiang
9b2f226473 Merge "Check error status after installing each DSU partition" am: fbd85db85d am: 73d5afb2cb am: dbe6d55157 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404669

Change-Id: I06c9dc97b6cf55884718357cdf3b0e03af583ba6
 2020-09-02 05:59:24 +00:00