Jiyong Park
ba366fd805
Merge "Replace framework-annotation-proc java lib with framework-all" am: f1083db49e
...
am: 99aac54513
Change-Id: I1cd00bfcea2e113a16c6b032eb457758599123fc
2019-11-13 17:29:02 -08:00
Jiyong Park
99aac54513
Merge "Replace framework-annotation-proc java lib with framework-all"
...
am: f1083db49e
Change-Id: I49fbeb2557c541d61b3034cbfdb6bf54cea2e677
2019-11-13 17:22:09 -08:00
Treehugger Robot
f1083db49e
Merge "Replace framework-annotation-proc java lib with framework-all"
2019-11-14 00:59:56 +00:00
Heemin Seog
01d77cef37
Merge "Add prefix to logs based on call source" into qt-qpr1-dev
...
am: 903cd4ceed
Change-Id: I0adb7b8b12fced1d365039e62faf44a987336b2c
2019-11-13 13:42:31 -08:00
TreeHugger Robot
903cd4ceed
Merge "Add prefix to logs based on call source" into qt-qpr1-dev
2019-11-13 21:33:01 +00:00
Daniel Rosenberg
727d98dd45
Merge "Actually use mContext directly" into qt-qpr1-dev
...
am: abd0f5ba3d
Change-Id: I42519afde4d3a15a0128a3cd32ff2cd410901a5d
2019-11-13 13:31:00 -08:00
Mathieu Chartier
4246db3281
Merge "Update ArtManagerService for new profilebootclasspath properties" am: c62f571265
...
am: 5b790b7612
Change-Id: I1643a669ddb99a27fad8193c656d91a53c76f7b8
2019-11-13 13:26:50 -08:00
TreeHugger Robot
abd0f5ba3d
Merge "Actually use mContext directly" into qt-qpr1-dev
2019-11-13 21:22:02 +00:00
Mathieu Chartier
5b790b7612
Merge "Update ArtManagerService for new profilebootclasspath properties"
...
am: c62f571265
Change-Id: If7af1c40d793c9c691f0284d9544858e100f675e
2019-11-13 13:19:18 -08:00
Mathieu Chartier
c62f571265
Merge "Update ArtManagerService for new profilebootclasspath properties"
2019-11-13 21:10:21 +00:00
Mathieu Chartier
3926ad2c0f
Update ArtManagerService for new profilebootclasspath properties
...
Added logic to use profilebootclasspath properties instead of
profilebootimage.
Bug: 139883463
Bug: 144173681
Test: manual
(cherry picked from commit 88db67cd49 )
Exempt-From-Owner-Approval: Cherry pick
Merged-In: I5b2947acbb77476b6dc7eed94e713ef7e8fb8f07
Change-Id: I6e5e69287cec0bea0a1ccf3756c8814454f6bbfa
2019-11-13 21:10:11 +00:00
Heemin Seog
e4528db5c4
Merge "DO NOT MERGE Create a single provider of car service" into qt-qpr1-dev
...
am: 8c7181ab91
Change-Id: Ief1afee6b133063e924389c7d43521eb0f6ba1fc
2019-11-13 12:45:14 -08:00
Heemin Seog
b2760dd3af
DO NOT MERGE Create a single provider of car service
...
am: e0e71bcabb
Change-Id: Ie13dac4c3df795bc0a20acc8b765a7c60fcb8d3e
2019-11-13 12:45:12 -08:00
TreeHugger Robot
8c7181ab91
Merge "DO NOT MERGE Create a single provider of car service" into qt-qpr1-dev
2019-11-13 20:32:34 +00:00
Artur Satayev
79aff5c601
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
...
am: 59318bab67
Change-Id: Ic691d764839ecf34daa8b53aa92497e013c9a2a7
2019-11-13 10:40:54 -08:00
Chen Xu
4c135a2ae2
Merge "cellbroadcast provider refactor" am: 1abff4f0db
...
am: 21c65d47cd
Change-Id: I4554b48b2a71d8c0daa18b8a51e8a7264a4bf741
2019-11-13 10:33:43 -08:00
Artur Satayev
59318bab67
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
...
am: a98026f7aa
Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Chen Xu
21c65d47cd
Merge "cellbroadcast provider refactor"
...
am: 1abff4f0db
Change-Id: I232020bb2f2bbc3a5083c2c7bc036b8f94e7ef6b
2019-11-13 10:26:04 -08:00
Treehugger Robot
a98026f7aa
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
2019-11-13 18:20:08 +00:00
Chen Xu
1abff4f0db
Merge "cellbroadcast provider refactor"
2019-11-13 18:19:05 +00:00
Jason Chiu
4f3bd65a73
Merge "Fix Settings creating too many threads unexpectedly" into qt-qpr1-dev
...
am: e1c11ca2e7
Change-Id: I09b13092823faa0326a588ac654877e0ad3c7613
2019-11-13 09:40:22 -08:00
TreeHugger Robot
e1c11ca2e7
Merge "Fix Settings creating too many threads unexpectedly" into qt-qpr1-dev
2019-11-13 17:33:58 +00:00
James Mattis
955c650a74
Merge "Support for hotspot client visibility." am: 81200971e1
...
am: 6f1bf857a6
Change-Id: Ie0b8b3f4ab168f132f4f6cc01df525c69c8cde41
2019-11-13 08:58:28 -08:00
James Mattis
6f1bf857a6
Merge "Support for hotspot client visibility."
...
am: 81200971e1
Change-Id: Ifadee94d1f602b9e70ba5a76731e3c990175be61
2019-11-13 08:53:25 -08:00
James Mattis
81200971e1
Merge "Support for hotspot client visibility."
2019-11-13 16:37:27 +00:00
Chen Xu
dd0c1c3687
cellbroadcast provider refactor
...
1. expose proper APIs to query framework cellbroadcast provider
2. export framework cellbroadcast provider
3. new URI with proper permission check
Bug: 135956699
Test: Build & Manual
Change-Id: Id9ef1876b27bcae6b297be4cc24809239c202f6a
(cherry picked from commit a32c7fc398 )
Merged-in: Id9ef1876b27bcae6b297be4cc24809239c202f6a
2019-11-13 08:32:41 -08:00
Anna Trostanetski
8e8c40b5c2
Merge "Move android.compat.annotation package out of libcore" am: b4852382fa
...
am: 22d585ee02
Change-Id: I9780a459aafe811b7ca2fbb839f4682278426d02
2019-11-13 08:07:42 -08:00
Artur Satayev
5a525851a8
Add @UnsupportedAppUsage to test apis that are known to be used by apps.
...
go/testapi-enforcement
Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Jorim Jaggi
b2803b2350
Merge "Record videos of the flicker tests" am: 6d5457bbb8
...
am: fcc92a701e
Change-Id: I239a36244a2c5d4a1051a150af0439a73fd7adf8
2019-11-13 06:16:19 -08:00
Anna Trostanetski
22d585ee02
Merge "Move android.compat.annotation package out of libcore"
...
am: b4852382fa
Change-Id: I2e28db812bdd35127069b45bfc05c9463772ff88
2019-11-13 06:13:19 -08:00
Jorim Jaggi
fcc92a701e
Merge "Record videos of the flicker tests"
...
am: 6d5457bbb8
Change-Id: I974be246c76a157f28bc232f0a52ee0a0ace6378
2019-11-13 06:06:13 -08:00
Paul Duffin
84e6f25e26
Merge "Move rewriting of references in OpenJDK source files to libcore" am: 9e9a777021
...
am: 43ab63fe75
Change-Id: I29f8a99763645b2cf77cc68d91d21fc4919b92f5
2019-11-13 06:05:05 -08:00
Jiyong Park
1c70cd06a8
Replace framework-annotation-proc java lib with framework-all
...
The purpose of the java lib framework-annotation-proc is to run some
annotation processesors on source files in framework-all-sources.
However, running an annotation processor requires the compilation
of the entire source files; in fact, the output of the annotation
processors are created as byproduct of the compilation. This is a
duplicated compliation because we already are compiling the source files
for the framework-all java lib. To reduce the duplication, replacing
the references to framework-annotation-proc with framework-all, and
removing framework-annotation-proc.
Test: m
Merged-In: I449488cba235211374e2825df97aae84395e60b6
(cherry picked from commit 0b5eb9a486 )
Change-Id: I449488cba235211374e2825df97aae84395e60b6
2019-11-13 21:18:14 +09:00
Anna Trostanetski
b4852382fa
Merge "Move android.compat.annotation package out of libcore"
2019-11-13 12:12:24 +00:00
Paul Duffin
43ab63fe75
Merge "Move rewriting of references in OpenJDK source files to libcore"
...
am: 9e9a777021
Change-Id: Ib47af126fbb69b4d6ef28ea11ebac09cdbf2a27b
2019-11-13 04:11:45 -08:00
Jorim Jaggi
6d5457bbb8
Merge "Record videos of the flicker tests"
2019-11-13 11:18:46 +00:00
Treehugger Robot
9e9a777021
Merge "Move rewriting of references in OpenJDK source files to libcore"
2019-11-13 10:57:35 +00:00
Jeff Vander Stoep
37e3d62cbc
Merge "Speed up and reenable test for b/141603906" am: 58578023dc
...
am: 24589540b2
Change-Id: I715948b5e483cd16ad617814d85b08778aea1bcb
2019-11-13 02:29:55 -08:00
Jeff Vander Stoep
24589540b2
Merge "Speed up and reenable test for b/141603906"
...
am: 58578023dc
Change-Id: Icbe88e4a9ea179b7fa105c7ee5346b3d22b6acc5
2019-11-13 02:21:51 -08:00
Treehugger Robot
58578023dc
Merge "Speed up and reenable test for b/141603906"
2019-11-13 10:05:49 +00:00
Jiyong Park
2072e8f7c6
Merge "Rename # vndk tag to # llndk" am: ba07364e94
...
am: 7172b09ef2
Change-Id: I5bdbbc279332f121038339814ebcf2ed2a3a6eb0
2019-11-12 22:54:47 -08:00
Jiyong Park
7172b09ef2
Merge "Rename # vndk tag to # llndk"
...
am: ba07364e94
Change-Id: Ib5ca9181cd8529f5ed552f6cad0579b26723d6e1
2019-11-12 22:46:26 -08:00
Treehugger Robot
ba07364e94
Merge "Rename # vndk tag to # llndk"
2019-11-13 06:36:36 +00:00
Jiyong Park
d0c8d9bd22
Rename # vndk tag to # llndk
...
The APIs that are tagged with # vndk are actually for LLNDK libraries.
Although LLNDK is part of VNDK, calling those APIs 'vndk' has given
users a wrong perception that the APIs don't need to be kept stable
because that's the norm for most of the VNDK libraries that are not
LLNDK.
In order to eliminate the misunderstanding, rename the tag to 'llndk' so
that people introducing new such API will realize what they are signing
themselves up for.
Exempt-From-Owner-Approval: cherry-pick from internal gerrit
Bug: 143765505
Test: m
Merged-In: I7ae77e232ec25cbe7afd98d1b68fc7a7fcf9bdfd
(cherry picked from commit a9258ab2e1 )
Change-Id: I7ae77e232ec25cbe7afd98d1b68fc7a7fcf9bdfd
2019-11-13 05:51:59 +00:00
Cheney Ni
f03727fa2f
[automerger skipped] Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" into qt-qpr1-dev
...
am: 2dbc1c0d82 -s ours
am skip reason: change_id I7d8f1a16b8358c440841801d95471b2d010739ec with SHA1 f1936c3423 is in history
Change-Id: I04ca9fe01e30a56cac2f13c86e61b7fff097644d
2019-11-12 18:53:32 -08:00
TreeHugger Robot
2dbc1c0d82
Merge "Add helpers to check whether the BluetoothCodecConfig instance is selectable" into qt-qpr1-dev
2019-11-13 02:48:43 +00:00
Joshua Baxter
f23b8cedd7
Merge "docs: fix code example" into qt-dev am: 330701c156 am: e53e500eac
...
am: ce02f1c4ac
Change-Id: If0426ae0547b15b106dc3e7fdfff94e94904f9e8
2019-11-12 18:21:10 -08:00
Joshua Baxter
ce02f1c4ac
Merge "docs: fix code example" into qt-dev am: 330701c156
...
am: e53e500eac
Change-Id: Ib02af685daa0668187661f9fffbedc4f248b8136
2019-11-12 18:13:03 -08:00
Joshua Baxter
e53e500eac
Merge "docs: fix code example" into qt-dev
...
am: 330701c156
Change-Id: I4f2ea4c128b2019d48b129f20bf8a800fc6b6fce
2019-11-12 18:04:50 -08:00
TreeHugger Robot
330701c156
Merge "docs: fix code example" into qt-dev
2019-11-13 01:26:15 +00:00